mirror of
https://github.com/hotyue/IP-Sentinel.git
synced 2026-05-12 03:39:40 +08:00
Compare commits
169 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
15324d0840 | ||
|
|
8b632fe4f9 | ||
|
|
11ff23bf94 | ||
|
|
332765a72e | ||
|
|
38869e8681 | ||
|
|
85cd1dc594 | ||
|
|
55f7ee0c8c | ||
|
|
d24be4da0b | ||
|
|
ae36155545 | ||
|
|
dc5560f8fd | ||
|
|
18985cb57d | ||
|
|
830d62ead8 | ||
|
|
5c8d9d6096 | ||
|
|
22d26079e4 | ||
|
|
c564ea0ab8 | ||
|
|
ec7bf0f2b9 | ||
|
|
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 | ||
|
|
a7f08ec7a7 | ||
|
|
f075fcce36 | ||
|
|
0bb96169e5 | ||
|
|
34320b2385 | ||
|
|
aeed9f0e57 | ||
|
|
c04a4c41e4 | ||
|
|
3b28ead0e4 | ||
|
|
d0ea5d09b1 | ||
|
|
a119973ec0 | ||
|
|
b8b91ac17e | ||
|
|
34f2c7e123 | ||
|
|
172f1e0209 | ||
|
|
1d5ed5d0cb | ||
|
|
1e150f26f1 | ||
|
|
03e735a44b | ||
|
|
011c1faad4 | ||
|
|
2325a8abdf | ||
|
|
201df489db | ||
|
|
2d680c5fc7 | ||
|
|
e77b7c0319 | ||
|
|
2283da7421 | ||
|
|
4a28f7f395 | ||
|
|
9a38fb62d0 | ||
|
|
fefd5dc60c | ||
|
|
89aa1ead33 | ||
|
|
a5f2fb53ed | ||
|
|
bd26f1011d | ||
|
|
cfaf156e03 | ||
|
|
75cf50ce0c | ||
|
|
e2b6bbc347 | ||
|
|
cd5160d1ea | ||
|
|
040827aa27 | ||
|
|
d00317a645 | ||
|
|
60317b4444 | ||
|
|
a0bb0f30f2 | ||
|
|
cc6f7bf958 | ||
|
|
583e0b00d8 | ||
|
|
c27f2fced9 | ||
|
|
8baa141339 | ||
|
|
2eceb43ac3 | ||
|
|
8ce9eb256b | ||
|
|
bf2cfb7da0 |
26
.github/workflows/daily_keywords.yml
vendored
26
.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 03:00 执行,为各节点全天随机拉取准备好弹药
|
||||||
- cron: '0 18 * * *'
|
- cron: '0 3 * * *'
|
||||||
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
|
||||||
|
|||||||
4
.github/workflows/ua_factory.yml
vendored
4
.github/workflows/ua_factory.yml
vendored
@@ -2,8 +2,8 @@ name: Automated Massive UA Factory
|
|||||||
|
|
||||||
on:
|
on:
|
||||||
schedule:
|
schedule:
|
||||||
# 每个月 1 号凌晨 00:00 执行
|
# 每个月 1 号凌晨 04:00 执行
|
||||||
- cron: '0 0 1 * *'
|
- cron: '0 4 1 * *'
|
||||||
workflow_dispatch: # 允许手动点击运行
|
workflow_dispatch: # 允许手动点击运行
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
|
|||||||
61
README.md
61
README.md
@@ -12,15 +12,18 @@
|
|||||||
|
|
||||||
## ✨ 核心极客特性 (Core Architecture)
|
## ✨ 核心极客特性 (Core Architecture)
|
||||||
|
|
||||||
- 🎛️ **L5 降维中枢与动态状态机 (Microservices Console)**:引入四级战区降维解析与双轨身份制。全 Inline Keyboard 原位重绘交互,支持在 TG 面板一键下发毫秒级模块热启停 (Toggle)、丝滑改名与日志抓取,底层数据库实时刷新,彻底告别刷屏烦恼。
|
- 📊 **深海声呐全维探针 (Deep Sea Sonar v4.0.4)**:内嵌强效正则去污的 JSON 提取引擎,无损展现免掩码的真实 IP 情报。聚合 Scamalytics、AbuseIPDB 等五大权威防欺诈库,精准嗅探代理/VPN特征、25端口及流媒体原生解锁状态,并自带 Google “送中”高危预警与污染趋势图谱。
|
||||||
- 🔄 **零信任 OTA 引擎 (Zero-Trust OTA Upgrade)**:[v3.6.0 巨献] 首创双端物理熔断机制。长官可通过私有中枢,一键向全球任意节点(或全舰队)下发 OTA 静默热重载指令。边缘节点自检授权后,将自动剥离交互进程、挂起后台拉取并无损覆盖系统内核,全程零感知。
|
- ⚡ **无损高并发引擎 (WAL Concurrency)**:司令部 SQLite 数据库全面激活 `WAL` (Write-Ahead Logging) 模式与毫秒级排队算法。即使对 500 台边缘节点发起全军总攻,也能完美规避 `database is locked` 与 Telegram `429` 拦截。
|
||||||
- 🛡️ **SSOT 溯源与热更新装甲 (Smooth Upgrade Engine)**:全系脚本彻底消灭硬编码,部署时动态抓取云端版本信标。自带状态机嗅探逻辑与防撞甲探测,即使是手动在终端运行安装,也仅需回车瞬间完成配置继承、数据同步与无损换代。
|
- 🪶 **抽脂级极简部署 (Zero-Bloat Native)**:全栈剔除第三方依赖,基于 Python3 原生标准库运行。安装强制注入 `--no-install-recommends` 防捆绑参数。无论是 128MB 内存的极简 NAT,还是 Alpine 游击队容器,均可如丝般顺滑运行。
|
||||||
- 🗺️ **全球拓扑矩阵与活体词库 (Global Nexus)**:守护版图横跨亚欧美三大洲。接入 GitHub Actions 云端流水线,每日静默同步全球各大区当日 Google 真实热搜榜单与高权重本土站点,让伪装行为永远贴合当地网络脉搏。
|
- 🎛️ **扁平化指挥矩阵 (Flat Command Matrix)**:引入扁平化四级战区降维视图与双轨身份制。深度定制 Inline Keyboard 逃生舱交互,支持原位丝滑重绘 (In-place UI Edit),实现毫秒级模块热启停与跨地域深海声呐投放。
|
||||||
- 👻 **资产持久化与错峰调度 (Hash-Seeded Persona)**:摒弃随机抽取指纹,基于节点物理 IP 哈希永久锁定 3 个绝对专属设备,完美构建高权重真实家庭内网画像。叠加按需智能分频与随机防并发休眠,化解“惊群效应”。
|
- 🔄 **全栈零信任 OTA 引擎 (Zero-Trust OTA Upgrade)**:首创双端物理熔断机制。长官可通过私有中枢,一键向全舰队下发静默热重载指令;更支持**「司令部金蝉脱壳」**,实现真正的全栈去 SSH 化运维。
|
||||||
- 🖧 **底层路由死锁与高精度探针 (Hard-Bind Routing)**:底层探测引擎强力接管 curl 核心参数 (`--interface`),将发出的每一滴伪装流量死死绑定在物理网卡或隧道 IP 上。配合多级 ISP 容灾链路,彻底杜绝双栈环境下的流量溢出与 API 误判。
|
- 🛡️ **SSOT 溯源与热更新装甲 (Smooth Upgrade Engine)**:全系脚本彻底消灭硬编码,动态抓取云端版本信标。自带状态机嗅探逻辑,即便是手动在老节点执行安装,也仅需回车瞬间完成配置继承与无损换代。
|
||||||
|
- 🗺️ **全球拓扑矩阵与活体词库 (Global Nexus)**:接入 GitHub Actions 云端兵工厂,每日静默同步全球各大区真实热搜榜单与高权重本土站点,让伪装行为永远贴合当地网络脉搏。
|
||||||
|
- 👻 **绝对时空对齐与高频错峰 (UTC-Seeded Scheduling)**:摒弃传统随机轮询,全栈强制接管底层时钟为**绝对 UTC 时间**。全舰队以 **20 分钟 (每日 72 次)** 的极高密度进行养护巡逻,叠加基于部署锚点的天然削峰与随机防并发休眠,完美化解十万级集群的“惊群效应”与 API 熔断。
|
||||||
|
- 🖧 **极速预检与三级容灾架构 (Fail-Fast & Fallback)**:底层引擎强力接管发包参数 (`--interface`) 的同时,创新引入 **4 秒极速预检 (Fail-Fast)** 雷达与**三级阶梯脱壳**机制。无论是纯 IPv6 孤岛、WARP 劫持死锁还是复杂 NAT 嵌套,系统均能瞬间避开网络黑洞,彻底杜绝探针假死与流量溢出。
|
||||||
|
|
||||||
**—— 💎 骨干基建特征 ——**
|
**—— 💎 骨干基建特征 ——**
|
||||||
- 🏭 **自动化指纹兵工厂**:依托 GitHub Actions CI/CD 流水线,每月 1 日无人值守锻造 4000+ 带绝对物理分区的真实终端设备数据。
|
- 🏭 **全自动云端军工厂 (CI/CD Data Factory)**:依托 GitHub Actions 构建双轨无人值守流水线。**每月 1 日**批量锻造 4000+ 带有绝对物理分区的原生终端指纹库;**每日凌晨 (UTC)** 实时抓取全球各战区 Google 真实热搜榜单与本土骨干新闻 RSS。为前线舰队源源不断地输送最鲜活的伪装弹药。
|
||||||
- 🔒 **叹息之墙 (Zero-Trust HMAC)**:底层通讯引入 时间戳 + HMAC-SHA256 军用级动态签名。指令有效期仅 60 秒(阅后即焚),未授权请求直接触发系统级 403 物理熔断,彻底免疫中间人抓包与重放攻击。
|
- 🔒 **叹息之墙 (Zero-Trust HMAC)**:底层通讯引入 时间戳 + HMAC-SHA256 军用级动态签名。指令有效期仅 60 秒(阅后即焚),未授权请求直接触发系统级 403 物理熔断,彻底免疫中间人抓包与重放攻击。
|
||||||
- ☁️ **云端中枢 (Public Master)**:官方公共机器人 [@OmniBeacon_bot](https://t.me/OmniBeacon_bot) ,新手免自建,一键接入极速入伍!同时支持硬核极客私有化 SQLite 分布式部署。
|
- ☁️ **云端中枢 (Public Master)**:官方公共机器人 [@OmniBeacon_bot](https://t.me/OmniBeacon_bot) ,新手免自建,一键接入极速入伍!同时支持硬核极客私有化 SQLite 分布式部署。
|
||||||
- 👁️🗨️ **玻璃房透明遥测 (Glasshouse)**:基于 Cloudflare Workers 的全透明计数中枢,绝对零隐私收集,仅作原子累加,底层网关源码全开源。
|
- 👁️🗨️ **玻璃房透明遥测 (Glasshouse)**:基于 Cloudflare Workers 的全透明计数中枢,绝对零隐私收集,仅作原子累加,底层网关源码全开源。
|
||||||
@@ -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,23 +74,21 @@ 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
|
||||||
```
|
```
|
||||||
- 激活节点:同上,将收到的暗号转发给官方机器人即可。
|
- 激活节点:同上,将收到的暗号转发给官方机器人即可。
|
||||||
|
|
||||||
## 🆙 架构级无损热升级指引 (Upgrade Guide)
|
## 🆙 架构级无损热升级指引 (Upgrade Guide)
|
||||||
### 📡 方式一:OTA 远程静默升级 (v3.6.0+ 私有中枢专属)
|
|
||||||
如果您是私有中枢领主,并且在前线节点安装时授权了 OTA 权限。当每日战报提示发现新版本时:
|
|
||||||
|
|
||||||
- 呼出您的司令部控制台 (/start)。
|
### 📡 方式一:OTA 远程静默升级 (私有中枢专属)
|
||||||
|
如果您是私有中枢领主,当司令部首页 (`/start`) 或每日战报提示发现新版本时:
|
||||||
|
|
||||||
- 若需升级单个节点:进入 我的节点列表 -> 选择节点 -> ⚙️ 高级控制功能 -> 点击 🆙 远程升级客户端。
|
1. **升级 Master 司令部自身**:在司令部顶级菜单,点击最上方的 `[ 🆙 升级司令部至 vX.X.X ]`。中枢将释放幽灵进程静默重构,数秒后向您发送捷报。
|
||||||
|
2. **升级全舰队 Agent**:在司令部顶级菜单,点击 `[ ☢️ 全舰队 OTA 热重载 ]`。
|
||||||
- 若需升级全舰队:直接在顶级菜单点击 ⚠️ 全舰队 OTA 升级(请注意风险确认)。
|
3. **升级单节点 Agent**:进入 `🌍 全球战区雷达` -> 选择目标节点 -> 在统一终端面板点击 `[ 🆙 OTA 静默升级 ]`。
|
||||||
|
*(⚠️ 节点收到指令后会在后台挂起静默拉取,全程无需登录 SSH,完成后将主动发回心跳确认!)*
|
||||||
- 无需登录 SSH! 节点收到指令后会在后台挂起静默拉取,并在几秒钟后通过 TG 重新给您发回带有新版本号的心跳确认!
|
|
||||||
|
|
||||||
### 💻 方式二:SSH 终端平滑直装 (适用于官方网关或老旧节点)
|
### 💻 方式二:SSH 终端平滑直装 (适用于官方网关或老旧节点)
|
||||||
如果您的节点不支持 OTA,或者您的节点版本过于陈旧 (如 v3.3.1):
|
如果您的节点不支持 OTA,或者您的节点版本过于陈旧 (如 v3.3.1):
|
||||||
@@ -116,12 +119,20 @@ bash <(curl -sL https://raw.githubusercontent.com/hotyue/IP-Sentinel/legacy/core
|
|||||||
如果你在使用过程中遇到任何疑难杂症,或者想围观大佬们的养护战报,欢迎加入我们的基地:
|
如果你在使用过程中遇到任何疑难杂症,或者想围观大佬们的养护战报,欢迎加入我们的基地:
|
||||||
- Telegram 频道: [@IP_Sentinel_Matrix](https://t.me/IP_Sentinel_Matrix)
|
- Telegram 频道: [@IP_Sentinel_Matrix](https://t.me/IP_Sentinel_Matrix)
|
||||||
|
|
||||||
## 🤝 参与贡献
|
## 🤝 参与贡献 (Contributors)
|
||||||
|
|
||||||
如果你想为项目增加新的节点区域(例如德国、英国、新加坡等),或者提供更丰富的本土化搜索词库,非常欢迎提交 Pull Request!
|
**🌟 感谢以下所有为 IP-Sentinel 添砖加瓦的指挥官们!** 你们的每一次 PR 都在让这艘战舰的全球雷达覆盖得更广。
|
||||||
|
|
||||||
## **v3.0 全球节点贡献规范:**
|
<a href="https://github.com/hotyue/IP-Sentinel/graphs/contributors">
|
||||||
|
<img src="https://contrib.rocks/image?repo=hotyue/IP-Sentinel" alt="Contributors" />
|
||||||
|
</a>
|
||||||
|
|
||||||
|
如果你想为项目增加新的节点区域(例如德国、英国、大洋洲等),或者提供更丰富的本土化搜索词库,非常欢迎提交 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`。
|
||||||
3. **最重要的一步:** 在 `data/map.json` 中登记你的国家、省州与城市信息。安装脚本将自动读取地图,在全球雷达中点亮你的节点!
|
3. **最重要的一步:** 在 `data/map.json` 中登记你的国家、省州与城市信息。安装脚本将自动读取地图,在全球雷达中点亮你的节点!
|
||||||
|
|||||||
@@ -24,10 +24,6 @@ if [ -z "$NODE_NAME" ]; then
|
|||||||
fi
|
fi
|
||||||
NODE_ALIAS="${NODE_ALIAS:-$NODE_NAME}"
|
NODE_ALIAS="${NODE_ALIAS:-$NODE_NAME}"
|
||||||
|
|
||||||
# --- [重点升级 1: 守护进程防冲突自检] ---
|
|
||||||
if pgrep -f "webhook.py $AGENT_PORT" > /dev/null; then
|
|
||||||
exit 0
|
|
||||||
fi
|
|
||||||
|
|
||||||
# 1. 尝试获取实时公网 IP
|
# 1. 尝试获取实时公网 IP
|
||||||
RAW_IP=$(curl -${IP_PREF:-4} -s -m 5 api.ip.sb/ip | tr -d '[:space:]')
|
RAW_IP=$(curl -${IP_PREF:-4} -s -m 5 api.ip.sb/ip | tr -d '[:space:]')
|
||||||
@@ -44,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
|
||||||
@@ -75,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
|
||||||
@@ -83,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'):
|
||||||
@@ -112,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")
|
||||||
@@ -122,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')
|
||||||
@@ -133,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()
|
||||||
@@ -155,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")
|
||||||
@@ -169,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")
|
||||||
@@ -182,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':
|
||||||
@@ -215,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]
|
||||||
@@ -374,11 +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")
|
||||||
|
|
||||||
# 挂起异步升级进程 (注入 SILENT_OTA 旁路变量跳过所有 read -p 交互)
|
# [修复] 逃逸 Systemd Cgroup,并引入 bash -n 语法树校验防砖机制
|
||||||
# 注意:这里我们写死拉取 dev-v3.6.0 分支的安装脚本进行覆盖测试,未来正式版上线时会改回 main
|
import shutil
|
||||||
repo_url = "https://raw.githubusercontent.com/hotyue/IP-Sentinel/dev-v3.6.0"
|
import base64
|
||||||
ota_cmd = f"export SILENT_OTA='true'; curl -sL {repo_url}/core/install.sh | bash > /opt/ip_sentinel/logs/ota_upgrade.log 2>&1 &"
|
# 动态提取部署时的源地址,废除强制写死 main 分支,保障隔离测试环境
|
||||||
subprocess.Popen(['bash', '-c', ota_cmd])
|
repo_url = "https://raw.githubusercontent.com/hotyue/IP-Sentinel/main"
|
||||||
|
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"):
|
||||||
|
full_cmd = f"systemd-run --quiet --no-block bash -c \"echo '{ota_script_b64}' | base64 -d | bash\""
|
||||||
|
else:
|
||||||
|
full_cmd = f"nohup bash -c \"echo '{ota_script_b64}' | base64 -d | bash\" >/dev/null 2>&1 &"
|
||||||
|
|
||||||
|
# 彻底统一为 os.system,消灭最后一个可能游离的 Popen 僵尸进程
|
||||||
|
os.system(full_cmd)
|
||||||
|
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
self.send_response(500)
|
self.send_response(500)
|
||||||
@@ -394,21 +473,49 @@ class AgentHandler(http.server.BaseHTTPRequestHandler):
|
|||||||
|
|
||||||
import socket
|
import socket
|
||||||
# ================== [v3.0.3 变更: 引入多线程模型抵抗 Slowloris 攻击] ==================
|
# ================== [v3.0.3 变更: 引入多线程模型抵抗 Slowloris 攻击] ==================
|
||||||
class ThreadedDualStackServer(socketserver.ThreadingMixIn, socketserver.TCPServer):
|
class ThreadedServer(socketserver.ThreadingMixIn, socketserver.TCPServer):
|
||||||
allow_reuse_address = True # 开启端口复用,防止热重启时端口冲突
|
allow_reuse_address = True # 开启端口复用,防止热重启时端口冲突
|
||||||
address_family = socket.AF_INET6 if socket.has_ipv6 else socket.AF_INET
|
|
||||||
|
# [核心修复] 显式关闭 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:
|
||||||
bind_addr = "::" if socket.has_ipv6 else ""
|
# 1. 优先尝试监听双栈/IPv6
|
||||||
with ThreadedDualStackServer((bind_addr, PORT), AgentHandler) as httpd:
|
ThreadedServer.address_family = socket.AF_INET6
|
||||||
httpd.serve_forever()
|
httpd = ThreadedServer(("::", PORT), AgentHandler)
|
||||||
|
except Exception:
|
||||||
|
# 2. [核心修复 Issue #23] 若系统内核已禁用 IPv6,抛弃报错,智能回退至纯 IPv4 监听
|
||||||
|
ThreadedServer.address_family = socket.AF_INET
|
||||||
|
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:
|
||||||
|
httpd.serve_forever()
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
sys.exit(1)
|
sys.exit(1)
|
||||||
# ====================================================================================
|
# ====================================================================================
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
# --- [重点升级 3: 真正的静默后台启动] ---
|
# --- [重点升级 3: 移交系统级守护进程接管 (阻塞模式)] ---
|
||||||
echo "🚀 [Agent] 正在后台启动 Webhook 监听服务 (端口: $AGENT_PORT)..."
|
echo "🚀 [Agent] 正在启动 Webhook 监听服务 (端口: $AGENT_PORT)..."
|
||||||
nohup python3 "${INSTALL_DIR}/core/webhook.py" "$AGENT_PORT" > /dev/null 2>&1 &
|
exec python3 "${INSTALL_DIR}/core/webhook.py" "$AGENT_PORT"
|
||||||
disown 2>/dev/null || true
|
|
||||||
echo "✅ [Agent] 守护进程启动完毕,可安全关闭终端。"
|
|
||||||
457
core/install.sh
457
core/install.sh
@@ -5,17 +5,27 @@
|
|||||||
# 核心功能: 战区分组菜单、模块按需开启、官方机器人一键配置、版本状态机路由
|
# 核心功能: 战区分组菜单、模块按需开启、官方机器人一键配置、版本状态机路由
|
||||||
# ==========================================================
|
# ==========================================================
|
||||||
|
|
||||||
|
# ==========================================================
|
||||||
|
# 🛑 核心权限防线: 检查是否以 root 权限运行
|
||||||
|
# ==========================================================
|
||||||
|
if [ "$EUID" -ne 0 ]; then
|
||||||
|
echo -e "\033[31m❌ 权限被拒绝: 部署 IP-Sentinel 需要最高系统权限。\033[0m"
|
||||||
|
echo -e "💡 请切换到 root 用户 (执行 su root 或 sudo -i) 后重新运行指令。"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
# 你的 GitHub 仓库 Raw 数据直链前缀
|
# 你的 GitHub 仓库 Raw 数据直链前缀
|
||||||
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/dev-v3.6.0"
|
# REPO_RAW_URL="https://raw.githubusercontent.com/hotyue/IP-Sentinel/v3.6.2-rc"
|
||||||
INSTALL_DIR="/opt/ip_sentinel"
|
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() {
|
||||||
@@ -26,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=()
|
||||||
|
|
||||||
# 基础探测:预检查缺失的命令
|
# 基础探测:预检查缺失的命令
|
||||||
@@ -44,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
|
||||||
|
|
||||||
@@ -155,6 +170,11 @@ fi
|
|||||||
|
|
||||||
# ================== [v3.1.1/v3.2.2 优化: 安装前环境纯净度清理] ==================
|
# ================== [v3.1.1/v3.2.2 优化: 安装前环境纯净度清理] ==================
|
||||||
echo -e "\n⏳ 正在清理旧版守护进程与冗余任务..."
|
echo -e "\n⏳ 正在清理旧版守护进程与冗余任务..."
|
||||||
|
# [新增] 优雅停止 Systemd 服务,防止代码替换时引发无限复活风暴
|
||||||
|
if command -v systemctl >/dev/null 2>&1; then
|
||||||
|
systemctl stop ip-sentinel-runner.timer ip-sentinel-updater.timer ip-sentinel-report.timer ip-sentinel-agent-daemon.service >/dev/null 2>&1 || true
|
||||||
|
fi
|
||||||
|
|
||||||
# 1. 强制超度可能存活的 Webhook 及各类看门狗进程,释放端口
|
# 1. 强制超度可能存活的 Webhook 及各类看门狗进程,释放端口
|
||||||
pkill -9 -f "webhook.py" >/dev/null 2>&1 || true
|
pkill -9 -f "webhook.py" >/dev/null 2>&1 || true
|
||||||
pkill -9 -f "agent_daemon.sh" >/dev/null 2>&1 || true
|
pkill -9 -f "agent_daemon.sh" >/dev/null 2>&1 || true
|
||||||
@@ -162,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 "🗑️ 历史日志已按指令清空。"
|
||||||
@@ -249,15 +282,17 @@ if [ "$UPGRADE_MODE" == "false" ]; then
|
|||||||
IFS="|" read -r CITY_ID CITY_NAME < /tmp/cities.txt
|
IFS="|" read -r CITY_ID CITY_NAME < /tmp/cities.txt
|
||||||
echo -e "\033[32m💡 该区域下仅有单一城市 [$CITY_NAME],已自动锁定。\033[0m"
|
echo -e "\033[32m💡 该区域下仅有单一城市 [$CITY_NAME],已自动锁定。\033[0m"
|
||||||
else
|
else
|
||||||
i=1; CITY_MAP=()
|
i=1; CITY_MAP=(); CITY_NAME_MAP=()
|
||||||
while IFS="|" read -r c_id c_name; do
|
while IFS="|" read -r c_id c_name; do
|
||||||
echo " $i) $c_name"
|
echo " $i) $c_name"
|
||||||
CITY_MAP[$i]="$c_id"
|
CITY_MAP[$i]="$c_id"
|
||||||
|
CITY_NAME_MAP[$i]="$c_name"
|
||||||
((i++))
|
((i++))
|
||||||
done < /tmp/cities.txt
|
done < /tmp/cities.txt
|
||||||
read -p "请输入选择 [1-$((i-1))] (默认1): " CI_SEL
|
read -p "请输入选择 [1-$((i-1))] (默认1): " CI_SEL
|
||||||
CI_SEL=${CI_SEL:-1}
|
CI_SEL=${CI_SEL:-1}
|
||||||
CITY_ID="${CITY_MAP[$CI_SEL]}"
|
CITY_ID="${CITY_MAP[$CI_SEL]}"
|
||||||
|
CITY_NAME="${CITY_NAME_MAP[$CI_SEL]}"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# 清理临时文件 (增加清理 continents.txt)
|
# 清理临时文件 (增加清理 continents.txt)
|
||||||
@@ -589,70 +624,283 @@ 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
|
||||||
|
|
||||||
# 7. 配置系统定时任务 (高频调度与看门狗)
|
# 拉取热数据与词库
|
||||||
echo -e "\n[7/7] 正在注入系统定时任务与看门狗进程..."
|
curl -sL "${REPO_RAW_URL}/data/user_agents.txt" -o "${INSTALL_DIR}/data/user_agents.txt"
|
||||||
crontab -l 2>/dev/null | grep -v "ip_sentinel" > /tmp/cron_backup || true
|
if [ "$UPGRADE_MODE" == "false" ]; then
|
||||||
|
curl -sL "${REPO_RAW_URL}/data/keywords/${KEYWORD_FILE}" -o "${INSTALL_DIR}/data/keywords/${KEYWORD_FILE}"
|
||||||
# 核心养护模块: 每 30 分钟触发一次
|
else
|
||||||
echo "*/30 * * * * ${INSTALL_DIR}/core/runner.sh >/dev/null 2>&1" >> /tmp/cron_backup
|
# 升级模式:利用已有的 REGION_CODE 更新通用词库
|
||||||
# 养料更新模块: (v3.3.0升级) 每天凌晨 3 点触发,由中枢自动进行分频调度
|
curl -sL "${REPO_RAW_URL}/data/keywords/kw_${REGION_CODE}.txt" -o "${INSTALL_DIR}/data/keywords/kw_${REGION_CODE}.txt" 2>/dev/null || true
|
||||||
echo "0 3 * * * ${INSTALL_DIR}/core/updater.sh >/dev/null 2>&1" >> /tmp/cron_backup
|
|
||||||
|
|
||||||
# [v3.3.0 新增] 初始化 UA 指纹库更新时间戳,确立 30 天滚动周期的计算锚点
|
|
||||||
echo $(date +%s) > "${INSTALL_DIR}/core/.ua_last_update"
|
|
||||||
|
|
||||||
# 如果配置了联控,启动 Webhook 与战报任务
|
|
||||||
if [[ -n "$TG_TOKEN" ]] && [[ -n "$CHAT_ID" ]]; then
|
|
||||||
# 每天早上 8 点发送昨天的统计战报
|
|
||||||
echo "0 8 * * * ${INSTALL_DIR}/core/tg_report.sh >/dev/null 2>&1" >> /tmp/cron_backup
|
|
||||||
|
|
||||||
# [v3.0.1新增修改 3: 删除原来的 curl 取 IP,直接使用我们上方锁定的 BIND_IP]
|
|
||||||
# 并提前写入 IP 缓存,彻底阻断 agent_daemon 首次启动时的重复推送
|
|
||||||
# [修复竞态]: 提前写入公网 IP 缓存,彻底阻断 agent_daemon 首次启动时的抢跑推送
|
|
||||||
echo "$SAFE_PUBLIC_IP" > "${INSTALL_DIR}/core/.last_ip"
|
|
||||||
|
|
||||||
# 双保险守护进程看门狗
|
|
||||||
echo "@reboot nohup bash ${INSTALL_DIR}/core/agent_daemon.sh >/dev/null 2>&1 &" >> /tmp/cron_backup
|
|
||||||
echo "* * * * * 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
|
fi
|
||||||
|
|
||||||
[ -f /tmp/cron_backup ] && crontab /tmp/cron_backup 2>/dev/null
|
# 7. 配置系统定时任务 (高频调度与看门狗)
|
||||||
rm -f /tmp/cron_backup
|
echo -e "\n[7/7] 正在注入系统守护进程与调度器..."
|
||||||
|
|
||||||
|
# [时钟同步核心] 获取部署时的绝对 UTC 时间锚点,用于打散全球节点的云端拉取并发
|
||||||
|
DEPLOY_UTC_HOUR=$(date -u +%H)
|
||||||
|
DEPLOY_UTC_MIN=$(date -u +%M)
|
||||||
|
|
||||||
|
# [v3.3.0 新增] 初始化 UA 指纹库更新时间戳,确立 30 天滚动周期的计算锚点 (强制 UTC)
|
||||||
|
echo $(date -u +%s) > "${INSTALL_DIR}/core/.ua_last_update"
|
||||||
|
|
||||||
|
if command -v systemctl >/dev/null 2>&1; then
|
||||||
|
echo "💡 检测到 Systemd 环境,正在部署原生守护服务..."
|
||||||
|
|
||||||
|
# 1. Runner 核心养护模块服务与定时器
|
||||||
|
cat > /etc/systemd/system/ip-sentinel-runner.service << EOF
|
||||||
|
[Unit]
|
||||||
|
Description=IP-Sentinel Runner Service
|
||||||
|
After=network.target
|
||||||
|
[Service]
|
||||||
|
Environment="PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
|
||||||
|
SyslogIdentifier=ip-sentinel
|
||||||
|
Type=oneshot
|
||||||
|
ExecStart=/bin/bash ${INSTALL_DIR}/core/runner.sh
|
||||||
|
User=root
|
||||||
|
CPUSchedulingPolicy=idle
|
||||||
|
IOSchedulingClass=idle
|
||||||
|
EOF
|
||||||
|
|
||||||
|
cat > /etc/systemd/system/ip-sentinel-runner.timer << EOF
|
||||||
|
[Unit]
|
||||||
|
Description=Timer for IP-Sentinel Runner Service
|
||||||
|
[Timer]
|
||||||
|
# [频率优化] 改用严格的 20 分钟步进,杜绝 OTA 瞬间的并发走火!
|
||||||
|
OnCalendar=*:0/20
|
||||||
|
RandomizedDelaySec=180
|
||||||
|
Persistent=true
|
||||||
|
Unit=ip-sentinel-runner.service
|
||||||
|
[Install]
|
||||||
|
WantedBy=timers.target
|
||||||
|
EOF
|
||||||
|
|
||||||
|
# 2. Updater 养料更新模块服务与定时器
|
||||||
|
cat > /etc/systemd/system/ip-sentinel-updater.service << EOF
|
||||||
|
[Unit]
|
||||||
|
Description=IP-Sentinel Updater Service
|
||||||
|
After=network.target
|
||||||
|
[Service]
|
||||||
|
Environment="PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
|
||||||
|
SyslogIdentifier=ip-sentinel
|
||||||
|
Type=oneshot
|
||||||
|
ExecStart=/bin/bash ${INSTALL_DIR}/core/updater.sh
|
||||||
|
User=root
|
||||||
|
CPUSchedulingPolicy=idle
|
||||||
|
IOSchedulingClass=idle
|
||||||
|
EOF
|
||||||
|
|
||||||
|
cat > /etc/systemd/system/ip-sentinel-updater.timer << EOF
|
||||||
|
[Unit]
|
||||||
|
Description=Timer for IP-Sentinel Updater Service
|
||||||
|
[Timer]
|
||||||
|
# [绝对 UTC 锚点] 每天精确在部署的时刻触发,实现全球请求的天然削峰
|
||||||
|
OnCalendar=*-*-* ${DEPLOY_UTC_HOUR}:${DEPLOY_UTC_MIN}:00 UTC
|
||||||
|
Persistent=true
|
||||||
|
Unit=ip-sentinel-updater.service
|
||||||
|
[Install]
|
||||||
|
WantedBy=timers.target
|
||||||
|
EOF
|
||||||
|
|
||||||
|
systemctl daemon-reload
|
||||||
|
systemctl enable --now ip-sentinel-runner.timer ip-sentinel-updater.timer
|
||||||
|
|
||||||
|
if [[ -n "$TG_TOKEN" ]] && [[ -n "$CHAT_ID" ]]; then
|
||||||
|
# 3. TG 战报服务与定时器
|
||||||
|
cat > /etc/systemd/system/ip-sentinel-report.service << EOF
|
||||||
|
[Unit]
|
||||||
|
Description=IP-Sentinel Telegram Report Service
|
||||||
|
After=network.target
|
||||||
|
[Service]
|
||||||
|
Environment="PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
|
||||||
|
SyslogIdentifier=ip-sentinel
|
||||||
|
Type=oneshot
|
||||||
|
ExecStart=/bin/bash ${INSTALL_DIR}/core/tg_report.sh
|
||||||
|
User=root
|
||||||
|
CPUSchedulingPolicy=idle
|
||||||
|
IOSchedulingClass=idle
|
||||||
|
EOF
|
||||||
|
|
||||||
|
cat > /etc/systemd/system/ip-sentinel-report.timer << EOF
|
||||||
|
[Unit]
|
||||||
|
Description=Timer for IP-Sentinel Telegram Report Service
|
||||||
|
[Timer]
|
||||||
|
# [绝对 UTC 锚点] 全球统一:每天 UTC 16:00 准时向司令部发送战报
|
||||||
|
OnCalendar=*-*-* 16:00:00 UTC
|
||||||
|
Unit=ip-sentinel-report.service
|
||||||
|
[Install]
|
||||||
|
WantedBy=timers.target
|
||||||
|
EOF
|
||||||
|
|
||||||
|
# 4. [排雷修复] Agent Daemon Webhook 监听守护服务 (Type=simple, 常驻执行)
|
||||||
|
cat > /etc/systemd/system/ip-sentinel-agent-daemon.service << EOF
|
||||||
|
[Unit]
|
||||||
|
Description=IP-Sentinel Agent Daemon Service
|
||||||
|
After=network.target
|
||||||
|
[Service]
|
||||||
|
Environment="PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
|
||||||
|
SyslogIdentifier=ip-sentinel
|
||||||
|
Type=simple
|
||||||
|
ExecStart=/bin/bash ${INSTALL_DIR}/core/agent_daemon.sh
|
||||||
|
Restart=always
|
||||||
|
RestartSec=5
|
||||||
|
User=root
|
||||||
|
CPUSchedulingPolicy=idle
|
||||||
|
IOSchedulingClass=idle
|
||||||
|
[Install]
|
||||||
|
WantedBy=multi-user.target
|
||||||
|
EOF
|
||||||
|
|
||||||
|
# [修复竞态]: 提前写入公网 IP 缓存,阻断重复推送
|
||||||
|
echo "$SAFE_PUBLIC_IP" > "${INSTALL_DIR}/core/.last_ip"
|
||||||
|
|
||||||
|
systemctl daemon-reload
|
||||||
|
systemctl enable --now ip-sentinel-report.timer
|
||||||
|
systemctl enable --now ip-sentinel-agent-daemon.service
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
echo "💡 未检测到 Systemd,正在配置备用调度器 (兼容 Alpine/OpenRC)..."
|
||||||
|
|
||||||
|
# ==========================================
|
||||||
|
# 🛑 智能环境嗅探: 判定是否为受限的 Alpine 容器环境
|
||||||
|
# ==========================================
|
||||||
|
IS_RESTRICTED_ALPINE="false"
|
||||||
|
if [ -f /etc/alpine-release ]; then
|
||||||
|
# 探测虚拟化类型:/proc/vz(OpenVZ), environ包含lxc(LXC), /.dockerenv(Docker)
|
||||||
|
if [ -d /proc/vz ] || grep -qa container=lxc /proc/1/environ 2>/dev/null || [ -f /.dockerenv ]; then
|
||||||
|
IS_RESTRICTED_ALPINE="true"
|
||||||
|
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. 写入我们的死循环守护进程
|
||||||
|
# [极客修复] 将 << 'EOF' 变为 << EOF,以允许在安装时将部署时刻的 DEPLOY_UTC 变量作为硬编码注入脚本中
|
||||||
|
cat > ${INSTALL_DIR}/core/sentinel_scheduler.sh << EOF
|
||||||
|
#!/bin/bash
|
||||||
|
while true; do
|
||||||
|
# 强制获取绝对 UTC 时分,免疫系统错误时区
|
||||||
|
MIN=\$(date -u +%M)
|
||||||
|
HOUR=\$(date -u +%H)
|
||||||
|
# [频率优化] 匹配 20 分钟步进 (00, 20, 40)
|
||||||
|
if [ "\$MIN" == "00" ] || [ "\$MIN" == "20" ] || [ "\$MIN" == "40" ]; then
|
||||||
|
/bin/bash /opt/ip_sentinel/core/runner.sh >/dev/null 2>&1
|
||||||
|
fi
|
||||||
|
# [绝对 UTC 锚点] 基于部署时刻的锚点触发热数据更新,天然并发削峰
|
||||||
|
if [ "\$HOUR" == "${DEPLOY_UTC_HOUR}" ] && [ "\$MIN" == "${DEPLOY_UTC_MIN}" ]; then
|
||||||
|
/bin/bash /opt/ip_sentinel/core/updater.sh >/dev/null 2>&1
|
||||||
|
fi
|
||||||
|
# [绝对 UTC 锚点] 统一 UTC 16:00 发送战报
|
||||||
|
if [ "\$HOUR" == "16" ] && [ "\$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
|
||||||
|
# [频率优化] 调整为 */20
|
||||||
|
echo "*/20 * * * * ${INSTALL_DIR}/core/runner.sh >/dev/null 2>&1" >> /tmp/cron_backup
|
||||||
|
# [绝对 UTC 锚点] 每天精确在部署的 UTC 时刻触发
|
||||||
|
echo "${DEPLOY_UTC_MIN} ${DEPLOY_UTC_HOUR} * * * ${INSTALL_DIR}/core/updater.sh >/dev/null 2>&1" >> /tmp/cron_backup
|
||||||
|
|
||||||
|
if [[ -n "$TG_TOKEN" ]] && [[ -n "$CHAT_ID" ]]; then
|
||||||
|
# [绝对 UTC 锚点] 统一 UTC 16:00
|
||||||
|
echo "0 16 * * * ${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
|
||||||
|
|
||||||
# ================== [v3.4.0 核心: 状态机驱动的热更新路由] ==================
|
# ================== [v3.4.0 核心: 状态机驱动的热更新路由] ==================
|
||||||
if [[ -n "$TG_TOKEN" ]] && [[ -n "$CHAT_ID" ]]; then
|
if [[ -n "$TG_TOKEN" ]] && [[ -n "$CHAT_ID" ]]; then
|
||||||
@@ -666,31 +914,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
|
||||||
|
|
||||||
@@ -705,16 +956,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"
|
||||||
@@ -732,7 +984,7 @@ else
|
|||||||
echo "🎉 边缘节点 (Agent) 部署流程彻底完成!"
|
echo "🎉 边缘节点 (Agent) 部署流程彻底完成!"
|
||||||
fi
|
fi
|
||||||
echo "📍 你的本地守护区域已锁定为: $REGION_NAME"
|
echo "📍 你的本地守护区域已锁定为: $REGION_NAME"
|
||||||
echo "⚙️ 哨兵现已开启 [每30分钟] 的高频高拟真养护循环。"
|
echo "⚙️ 哨兵现已开启 [每20分钟] 的高频高拟真养护循环。"
|
||||||
if [[ -n "$TG_TOKEN" ]]; then
|
if [[ -n "$TG_TOKEN" ]]; then
|
||||||
echo "📡 Webhook 监听已启动 (端口: $AGENT_PORT) 并向中枢发送了注册请求。"
|
echo "📡 Webhook 监听已启动 (端口: $AGENT_PORT) 并向中枢发送了注册请求。"
|
||||||
|
|
||||||
@@ -762,12 +1014,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,21 @@ 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")
|
||||||
|
# [时区对齐] 强制无视本地时区,以绝对 UTC 时间写入日志
|
||||||
|
echo "[$(date -u '+%Y-%m-%d %H:%M:%S UTC')] $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 +109,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 +171,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
|
||||||
|
|
||||||
|
|||||||
266
core/mod_quality.sh
Executable file
266
core/mod_quality.sh
Executable file
@@ -0,0 +1,266 @@
|
|||||||
|
#!/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,双栈 CDN 保底,外加文件防伪强校验)
|
||||||
|
PROBE_SCRIPT="/opt/ip_sentinel/core/ip_probe.sh"
|
||||||
|
|
||||||
|
# [校验 1] 验证本地残留脚本是否损坏 (防止之前被墙或拦截返回了 HTML 报错页)
|
||||||
|
if [ -f "$PROBE_SCRIPT" ] && ! grep -q "xykt" "$PROBE_SCRIPT" 2>/dev/null; then
|
||||||
|
rm -f "$PROBE_SCRIPT"
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ ! -s "$PROBE_SCRIPT" ]; then
|
||||||
|
# 🛡️ 首选防线: 严格遵守从 GitHub 官方主干拉取,捍卫纯净底线
|
||||||
|
curl -sL -m 10 "https://raw.githubusercontent.com/xykt/IPQuality/main/ip.sh" -o "$PROBE_SCRIPT" 2>/dev/null
|
||||||
|
|
||||||
|
# 🚑 文件防伪校验: 如果纯 V6 无法解析 GitHub 返回了 HTML 报错页,剔除它!
|
||||||
|
if ! grep -q "xykt" "$PROBE_SCRIPT" 2>/dev/null; then
|
||||||
|
rm -f "$PROBE_SCRIPT" 2>/dev/null
|
||||||
|
# 降级到双栈 CDN 节点兜底 (仅在 GitHub 彻底失效时启用)
|
||||||
|
curl -sL -m 15 "https://IP.Check.Place" -o "$PROBE_SCRIPT" 2>/dev/null
|
||||||
|
fi
|
||||||
|
chmod +x "$PROBE_SCRIPT" 2>/dev/null
|
||||||
|
fi
|
||||||
|
|
||||||
|
# ==========================================
|
||||||
|
# 3. 极速预检与容灾打靶系统
|
||||||
|
# ==========================================
|
||||||
|
|
||||||
|
# 封装链路预检函数 (4秒极速探路,拒绝死等)
|
||||||
|
preflight_check() {
|
||||||
|
local curl_args=("-s" "-m" "4")
|
||||||
|
# 提取网卡和协议约束
|
||||||
|
for ((i=1; i<=$#; i++)); do
|
||||||
|
if [[ "${!i}" == "-i" ]]; then
|
||||||
|
local next=$((i+1))
|
||||||
|
curl_args+=("--interface" "${!next}")
|
||||||
|
elif [[ "${!i}" == "-4" ]]; then
|
||||||
|
curl_args+=("-4")
|
||||||
|
elif [[ "${!i}" == "-6" ]]; then
|
||||||
|
curl_args+=("-6")
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
# 验证该路由设置是否能成功连通外部网络
|
||||||
|
curl "${curl_args[@]}" "https://www.cloudflare.com/cdn-cgi/trace" >/dev/null 2>&1
|
||||||
|
return $?
|
||||||
|
}
|
||||||
|
|
||||||
|
# 📡 寻路雷达:测定哪一组参数可以走通
|
||||||
|
FINAL_ARGS=()
|
||||||
|
if preflight_check "${PROBE_ARGS[@]}"; then
|
||||||
|
# 阶梯 0: 原定参数 (带 BIND_IP 和协议) 通畅
|
||||||
|
FINAL_ARGS=("${PROBE_ARGS[@]}")
|
||||||
|
else
|
||||||
|
# 阶梯 1: 剥离物理网卡限制,只保留协议限制
|
||||||
|
FALLBACK_ARGS=("-y" "-j" "-${DYNAMIC_IP_PREF}")
|
||||||
|
if preflight_check "${FALLBACK_ARGS[@]}"; then
|
||||||
|
FINAL_ARGS=("${FALLBACK_ARGS[@]}")
|
||||||
|
else
|
||||||
|
# 阶梯 2: 终极裸跑 (不限网卡,不限协议)
|
||||||
|
FINAL_ARGS=("-y" "-j")
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
# ==========================================
|
||||||
|
# 4. 终极实弹打靶
|
||||||
|
# ==========================================
|
||||||
|
|
||||||
|
# 此时 FINAL_ARGS 已经被证实是连通的,我们只执行 1 次 ip.sh
|
||||||
|
# 将超时放宽至 300 秒,给第三方 API (如 ipregistry) 充足的响应时间
|
||||||
|
RAW_OUTPUT=$(timeout 300 bash "$PROBE_SCRIPT" "${FINAL_ARGS[@]}" 2>/dev/null)
|
||||||
|
JSON_DATA="{${RAW_OUTPUT#*\{}"
|
||||||
|
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")
|
||||||
|
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
|
||||||
|
|
||||||
|
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:-未知}"
|
||||||
|
# [时区对齐] 深海声呐战报落款强制采用绝对 UTC 时间
|
||||||
|
CURRENT_TIME=$(date -u "+%Y-%m-%d %H:%M:%S UTC")
|
||||||
|
# [体验修复] 探针返回的 IP 带有星号掩码,强制使用中枢下发的真实 IP 拼接,以防直达链接失效!
|
||||||
|
LINK_IP=$(echo "$PUBLIC_IP" | 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
|
||||||
@@ -11,7 +11,7 @@ UA_FILE="${INSTALL_DIR}/data/user_agents.txt"
|
|||||||
# 你的 GitHub 仓库 Raw 数据直链前缀
|
# 你的 GitHub 仓库 Raw 数据直链前缀
|
||||||
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://git.94211762.xyz/hotyue/IP-Sentinel/raw/branch/main"
|
# REPO_RAW_URL="https://raw.githubusercontent.com/hotyue/IP-Sentinel/v3.6.2-rc"
|
||||||
|
|
||||||
# 1. 基础环境校验
|
# 1. 基础环境校验
|
||||||
[ ! -f "$CONFIG_FILE" ] && exit 1
|
[ ! -f "$CONFIG_FILE" ] && exit 1
|
||||||
@@ -45,7 +45,8 @@ fi
|
|||||||
log_msg() {
|
log_msg() {
|
||||||
local TYPE=$1
|
local TYPE=$1
|
||||||
local MSG=$2
|
local MSG=$2
|
||||||
local TIME=$(date "+%Y-%m-%d %H:%M:%S")
|
# [时区对齐] 强制无视本地时区,以绝对 UTC 时间生成日志时间戳
|
||||||
|
local TIME=$(date -u "+%Y-%m-%d %H:%M:%S UTC")
|
||||||
# [v3.4.0 核心] 提取当前配置中的版本锚点
|
# [v3.4.0 核心] 提取当前配置中的版本锚点
|
||||||
local local_ver="${AGENT_VERSION:-未知}"
|
local local_ver="${AGENT_VERSION:-未知}"
|
||||||
|
|
||||||
@@ -99,14 +100,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,14 +33,24 @@ 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 -u '+%Y-%m-%d %H:%M:%S UTC')] $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
|
||||||
|
|
||||||
# 3. 防僵尸网络特征 (Cron Jitter) - 核心隐蔽逻辑
|
# 3. 防僵尸网络特征 (Cron Jitter) - 核心隐蔽逻辑
|
||||||
# 配合每 30 分钟的调度周期,将随机休眠控制在 0 到 180 秒内,彻底打散全球并发请求
|
# 配合每 20 分钟的调度周期,将随机休眠控制在 0 到 180 秒内,彻底打散全球并发请求
|
||||||
if [ -t 1 ]; then
|
if [ -t 1 ]; then
|
||||||
log "SYSTEM" "INFO " "💻 检测到人工终端干预,跳过静默休眠,立即执行任务!"
|
log "SYSTEM" "INFO " "💻 检测到人工终端干预,跳过静默休眠,立即执行任务!"
|
||||||
else
|
else
|
||||||
@@ -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
|
||||||
|
|
||||||
@@ -86,10 +92,11 @@ case "$REGION_CODE" in
|
|||||||
"SG") FLAG="🇸🇬" ;;
|
"SG") FLAG="🇸🇬" ;;
|
||||||
"HK") FLAG="🇭🇰" ;;
|
"HK") FLAG="🇭🇰" ;;
|
||||||
"GB"|"UK") FLAG="🇬🇧" ;;
|
"GB"|"UK") FLAG="🇬🇧" ;;
|
||||||
|
"AU") FLAG="🇦🇺" ;;
|
||||||
*) FLAG="🌐" ;;
|
*) FLAG="🌐" ;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
# 3. 截取过去 24 小时的日志 (每天48次轮询,保留最新 1000 行足以覆盖单日战报)
|
# 3. 截取过去 24 小时的日志 (每天72次轮询,保留最新 1000 行足以覆盖单日战报)
|
||||||
LOG_CONTENT=$(tail -n 1000 "$LOG_FILE" 2>/dev/null)
|
LOG_CONTENT=$(tail -n 1000 "$LOG_FILE" 2>/dev/null)
|
||||||
|
|
||||||
if [ -z "$LOG_CONTENT" ]; then
|
if [ -z "$LOG_CONTENT" ]; then
|
||||||
@@ -157,7 +164,7 @@ else
|
|||||||
MSG="$MSG
|
MSG="$MSG
|
||||||
|
|
||||||
🕒 **最近执行快照 [${LAST_MOD:-"System"}]:**
|
🕒 **最近执行快照 [${LAST_MOD:-"System"}]:**
|
||||||
时间: ${LAST_TIME:-"暂无数据"}
|
时间: ${LAST_TIME:-"暂无数据"} (节点本地)
|
||||||
结论: ${LAST_SCORE:-"暂无数据"}"
|
结论: ${LAST_SCORE:-"暂无数据"}"
|
||||||
|
|
||||||
fi
|
fi
|
||||||
@@ -167,6 +174,8 @@ fi
|
|||||||
# ==========================================
|
# ==========================================
|
||||||
# 从配置文件提取当前本地版本,若无则默认为未知
|
# 从配置文件提取当前本地版本,若无则默认为未知
|
||||||
LOCAL_VER="${AGENT_VERSION:-未知}"
|
LOCAL_VER="${AGENT_VERSION:-未知}"
|
||||||
|
# [时区对齐] 强制获取当前绝对 UTC 时间,作为全局统一的战报落款
|
||||||
|
REPORT_UTC_TIME=$(date -u "+%Y-%m-%d %H:%M:%S UTC")
|
||||||
|
|
||||||
# 极轻量级探针: 抓取 GitHub 云端的 version.txt (超时 3 秒,KV解析法)
|
# 极轻量级探针: 抓取 GitHub 云端的 version.txt (超时 3 秒,KV解析法)
|
||||||
REPO_RAW_URL="https://raw.githubusercontent.com/hotyue/IP-Sentinel/main"
|
REPO_RAW_URL="https://raw.githubusercontent.com/hotyue/IP-Sentinel/main"
|
||||||
@@ -176,6 +185,7 @@ REMOTE_VER=$(curl -s -m 3 "${REPO_RAW_URL}/version.txt" | grep "^AGENT_VERSION="
|
|||||||
MSG="$MSG
|
MSG="$MSG
|
||||||
----------------------------
|
----------------------------
|
||||||
🛡️ **系统引擎状态**
|
🛡️ **系统引擎状态**
|
||||||
|
⏱️ 战报生成: \`${REPORT_UTC_TIME}\`
|
||||||
当前运行版本: \`v${LOCAL_VER}\`"
|
当前运行版本: \`v${LOCAL_VER}\`"
|
||||||
|
|
||||||
# 比对逻辑:如果成功抓到了远端版本,且和本地不一样
|
# 比对逻辑:如果成功抓到了远端版本,且和本地不一样
|
||||||
@@ -193,11 +203,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"
|
||||||
|
|||||||
@@ -1,10 +1,18 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
# ==========================================================
|
|
||||||
# 脚本名称: uninstall.sh (IP-Sentinel 一键卸载脚本 - 动态锚点版)
|
# 脚本名称: uninstall.sh (IP-Sentinel 一键卸载脚本 - 动态锚点版)
|
||||||
# 核心功能: 无痕清理守护进程、定时任务、运行目录及临时缓存
|
# 核心功能: 无痕清理守护进程、定时任务、运行目录及临时缓存
|
||||||
# ==========================================================
|
# ==========================================================
|
||||||
|
|
||||||
|
# ==========================================================
|
||||||
|
# 🛑 核心权限防线: 检查是否以 root 权限运行
|
||||||
|
# ==========================================================
|
||||||
|
if [ "$EUID" -ne 0 ]; then
|
||||||
|
echo -e "\033[31m❌ 权限被拒绝: 卸载 IP-Sentinel 需要最高系统权限。\033[0m"
|
||||||
|
echo -e "💡 请切换到 root 用户 (执行 su root 或 sudo -i) 后重新运行指令。"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
INSTALL_DIR="/opt/ip_sentinel"
|
INSTALL_DIR="/opt/ip_sentinel"
|
||||||
|
|
||||||
echo "========================================================"
|
echo "========================================================"
|
||||||
@@ -18,13 +26,31 @@ if [ -f "$CONFIG_FILE" ]; then
|
|||||||
fi
|
fi
|
||||||
echo "========================================================"
|
echo "========================================================"
|
||||||
|
|
||||||
# 1. 停止运行中的守护进程与主控模块 (涵盖所有历史版本进程)
|
# 1. 停止并删除 Systemd 服务 (适配新架构)
|
||||||
echo "[1/3] 正在终止后台守护进程与所有养护任务..."
|
echo "[1/4] 正在停止并删除 Systemd 服务..."
|
||||||
|
if command -v systemctl >/dev/null 2>&1; then
|
||||||
|
echo "💡 检测到 Systemd 环境,正在抹除 Systemd 服务单元..."
|
||||||
|
systemctl disable --now ip-sentinel-runner.service ip-sentinel-runner.timer \
|
||||||
|
ip-sentinel-updater.service ip-sentinel-updater.timer \
|
||||||
|
ip-sentinel-report.service ip-sentinel-report.timer \
|
||||||
|
ip-sentinel-agent-daemon.service >/dev/null 2>&1
|
||||||
|
rm -f /etc/systemd/system/ip-sentinel-runner.service
|
||||||
|
rm -f /etc/systemd/system/ip-sentinel-runner.timer
|
||||||
|
rm -f /etc/systemd/system/ip-sentinel-updater.service
|
||||||
|
rm -f /etc/systemd/system/ip-sentinel-updater.timer
|
||||||
|
rm -f /etc/systemd/system/ip-sentinel-report.service
|
||||||
|
rm -f /etc/systemd/system/ip-sentinel-report.timer
|
||||||
|
rm -f /etc/systemd/system/ip-sentinel-agent-daemon.service
|
||||||
|
systemctl daemon-reload
|
||||||
|
systemctl reset-failed
|
||||||
|
else
|
||||||
|
echo "💡 未检测到 Systemd,跳过此步骤..."
|
||||||
|
fi
|
||||||
|
|
||||||
# 使用 pkill 替代传统的 pgrep | xargs,指令更短、容错率更高
|
# 2. 停止运行中的守护进程与主控模块 (兜底清理老版进程)
|
||||||
|
echo "[2/4] 正在终止后台守护进程与所有养护任务..."
|
||||||
pkill -9 -f "tg_daemon.sh" >/dev/null 2>&1
|
pkill -9 -f "tg_daemon.sh" >/dev/null 2>&1
|
||||||
pkill -9 -f "agent_daemon.sh" >/dev/null 2>&1
|
pkill -9 -f "agent_daemon.sh" >/dev/null 2>&1
|
||||||
# [v3.4.0 优化] 确保清理所有 python3 调起的 Webhook 实例
|
|
||||||
pkill -9 -f "python3.*webhook.py" >/dev/null 2>&1
|
pkill -9 -f "python3.*webhook.py" >/dev/null 2>&1
|
||||||
pkill -9 -f "webhook.py" >/dev/null 2>&1
|
pkill -9 -f "webhook.py" >/dev/null 2>&1
|
||||||
pkill -9 -f "runner.sh" >/dev/null 2>&1
|
pkill -9 -f "runner.sh" >/dev/null 2>&1
|
||||||
@@ -32,17 +58,37 @@ 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
|
||||||
|
|
||||||
# 2. 清除系统定时任务 (Cron)
|
# 3. 清除系统定时任务 (Cron)
|
||||||
echo "[2/3] 正在清理系统定时任务 (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
|
||||||
|
|
||||||
# 3. 删除所有文件、日志与临时缓存
|
rm -f /tmp/cron_clean
|
||||||
echo "[3/3] 正在抹除核心程序、配置文件与系统痕迹..."
|
|
||||||
|
# 4. 删除所有文件、日志与临时缓存
|
||||||
|
echo "[4/4] 正在抹除核心程序、配置文件与系统痕迹..."
|
||||||
if [ -d "$INSTALL_DIR" ]; then
|
if [ -d "$INSTALL_DIR" ]; then
|
||||||
rm -rf "$INSTALL_DIR"
|
rm -rf "$INSTALL_DIR"
|
||||||
fi
|
fi
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ UA_TIME_FILE="${INSTALL_DIR}/core/.ua_last_update"
|
|||||||
# GitHub 仓库 Raw 数据直链前缀
|
# GitHub 仓库 Raw 数据直链前缀
|
||||||
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/dev-v3.6.0"
|
# REPO_RAW_URL="https://raw.githubusercontent.com/hotyue/IP-Sentinel/v3.6.2-rc"
|
||||||
|
|
||||||
# 1. 加载本地冷数据配置
|
# 1. 加载本地冷数据配置
|
||||||
if [ ! -f "$CONFIG_FILE" ]; then
|
if [ ! -f "$CONFIG_FILE" ]; then
|
||||||
@@ -25,9 +25,21 @@ 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")
|
||||||
|
# [时区对齐] 强制无视本地时区,以绝对 UTC 时间写入日志
|
||||||
|
echo "[$(date -u '+%Y-%m-%d %H:%M:%S UTC')] $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 +54,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 +134,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 行)
|
||||||
# ==========================================================
|
# ==========================================================
|
||||||
|
|||||||
200
data/keywords/kw_AU.txt
Normal file
200
data/keywords/kw_AU.txt
Normal file
@@ -0,0 +1,200 @@
|
|||||||
|
weather brisbane
|
||||||
|
raptors vs cavaliers
|
||||||
|
galatasaray
|
||||||
|
multan sultans vs islamabad united
|
||||||
|
galatasaray vs fenerbahçe
|
||||||
|
torino vs inter
|
||||||
|
hearts fc
|
||||||
|
scottish premier league
|
||||||
|
mohsin khan
|
||||||
|
angkrish raghuvanshi
|
||||||
|
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
|
||||||
|
d4vd
|
||||||
|
mi vs gt
|
||||||
|
perth weather
|
||||||
|
elijah hollands carlton football club
|
||||||
|
fair work commission fuel
|
||||||
|
vanguard
|
||||||
|
sydney sweeney
|
||||||
|
cailee spaeny
|
||||||
|
psg vs lyon
|
||||||
|
sporting vs benfica
|
||||||
|
celtics vs 76ers
|
||||||
|
bundesliga
|
||||||
|
pl
|
||||||
|
afc cup
|
||||||
|
mars rover
|
||||||
|
bayern vs vfb stuttgart
|
||||||
|
bom radar
|
||||||
|
sydney weather
|
||||||
|
melbourne weather
|
||||||
|
brisbane weather
|
||||||
|
adelaide weather
|
||||||
|
myGov login
|
||||||
|
news.com.au
|
||||||
|
abc news
|
||||||
|
nrl ladder
|
||||||
|
afl scores
|
||||||
|
afl fixture
|
||||||
|
matildas
|
||||||
|
sam kerr
|
||||||
|
bunnings opening hours
|
||||||
|
coles catalogue
|
||||||
|
woolies specials
|
||||||
|
qantas
|
||||||
|
virgin australia
|
||||||
|
jetstar flights
|
||||||
|
commbank
|
||||||
|
asx 200
|
||||||
|
sydney morning herald
|
||||||
|
the age
|
||||||
|
ticketek
|
||||||
|
ticketmaster
|
||||||
|
opal card top up
|
||||||
|
myki top up
|
||||||
|
translink timetable
|
||||||
|
transperth journey planner
|
||||||
|
adelaide metro
|
||||||
|
adelaide 500
|
||||||
|
adelaide crows
|
||||||
|
port adelaide
|
||||||
|
penrith panthers
|
||||||
|
brisbane broncos
|
||||||
|
collingwood fc
|
||||||
|
sydney swans
|
||||||
|
west coast eagles
|
||||||
|
fremantle dockers
|
||||||
|
canberra raiders
|
||||||
|
mcg events
|
||||||
|
optus stadium
|
||||||
|
the gabba
|
||||||
|
state of origin
|
||||||
|
australian open
|
||||||
|
melbourne cup
|
||||||
|
masterchef australia
|
||||||
|
mafs australia
|
||||||
|
petrol prices near me
|
||||||
|
australia post tracking
|
||||||
|
service nsw login
|
||||||
|
vicroads
|
||||||
|
queensland health
|
||||||
|
medicare
|
||||||
|
ato
|
||||||
|
jb hi-fi
|
||||||
|
kmart
|
||||||
|
amazon.com.au
|
||||||
|
vivid sydney
|
||||||
|
mona hobart
|
||||||
|
dark mofo
|
||||||
|
floriade canberra
|
||||||
|
rottnest island ferry
|
||||||
|
sydney airport arrivals
|
||||||
|
rba interest rate
|
||||||
|
nsw school holidays
|
||||||
|
qld school holidays
|
||||||
|
wa school holidays
|
||||||
|
m4 traffic updates
|
||||||
|
west gate tunnel updates
|
||||||
|
bruce highway traffic
|
||||||
|
taylor swift
|
||||||
|
netflix
|
||||||
|
gemini
|
||||||
|
chatgpt
|
||||||
|
margot robbie
|
||||||
|
oscar piastri
|
||||||
|
formula 1
|
||||||
|
supercars championship
|
||||||
|
ufc
|
||||||
|
optus sport
|
||||||
|
telstra outage
|
||||||
|
kayo sports
|
||||||
|
domain real estate
|
||||||
|
realestate.com.au
|
||||||
|
seek jobs
|
||||||
|
gumtree
|
||||||
|
westpac login
|
||||||
|
anz internet banking
|
||||||
|
nab login
|
||||||
|
aldi catalogue
|
||||||
|
big w
|
||||||
|
target australia
|
||||||
|
the good guys
|
||||||
|
officeworks
|
||||||
|
dan murphys
|
||||||
|
bws
|
||||||
|
chemist warehouse
|
||||||
|
priceline
|
||||||
@@ -1,5 +1,130 @@
|
|||||||
syria
|
boston bruins
|
||||||
|
patrick corbin
|
||||||
|
avs vs sporting
|
||||||
|
peyton krebs
|
||||||
|
elena rybakina
|
||||||
|
shane doan
|
||||||
|
ja'kobe walter
|
||||||
|
mitch marner
|
||||||
|
radio-canada
|
||||||
|
golf
|
||||||
|
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
|
||||||
|
ibm
|
||||||
|
lecce vs fiorentina
|
||||||
|
celeste rivas hernandez
|
||||||
|
abhishek bachchan
|
||||||
|
national guard of the united states
|
||||||
|
triathlon
|
||||||
|
vincent trocheck
|
||||||
|
benyamin netanyahou
|
||||||
|
kings vs avalanche
|
||||||
|
crème solaire
|
||||||
|
trabzonspor vs istanbul başakşehir
|
||||||
|
indigenous rights
|
||||||
|
meghan, duchess of sussex
|
||||||
|
gwyneth paltrow
|
||||||
|
toronto gas prices
|
||||||
|
président
|
||||||
|
mets vs cubs
|
||||||
|
matt fitzpatrick
|
||||||
|
sénateurs – hurricanes
|
||||||
|
senators vs hurricanes
|
||||||
|
man utd
|
||||||
|
spurs
|
||||||
|
evan mobley
|
||||||
|
chelsea vs man united
|
||||||
|
atlético madrid vs real sociedad
|
||||||
|
roma vs atalanta
|
||||||
|
cf montreal
|
||||||
|
jakob poeltl
|
||||||
|
ukraine
|
||||||
|
contrôle routier québec
|
||||||
|
bachelorette 2026
|
||||||
|
lens – toulouse
|
||||||
|
arber xhekaj
|
||||||
leylah fernandez
|
leylah fernandez
|
||||||
|
anthropic
|
||||||
|
paige wwe
|
||||||
|
inter – cagliari
|
||||||
|
carrie ann inaba
|
||||||
|
syria
|
||||||
highway hotline sk
|
highway hotline sk
|
||||||
real betis vs braga
|
real betis vs braga
|
||||||
vincent bolloré
|
vincent bolloré
|
||||||
|
|||||||
@@ -1,3 +1,127 @@
|
|||||||
|
bulgarien
|
||||||
|
george clooney
|
||||||
|
jork
|
||||||
|
star citizen
|
||||||
|
donau
|
||||||
|
krassnitzer harald
|
||||||
|
buxtehude
|
||||||
|
chernobyl
|
||||||
|
avs – sporting
|
||||||
|
running point
|
||||||
|
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
|
||||||
|
ministerpräsident
|
||||||
|
robbie williams
|
||||||
|
brian littrell
|
||||||
|
saarbrücken hauptbahnhof
|
||||||
|
frauen-bundesliga
|
||||||
|
lemgo
|
||||||
|
kommissar rex
|
||||||
|
hemsbach
|
||||||
|
benjamin weber
|
||||||
|
sydney sweeney
|
||||||
|
martin schindler
|
||||||
|
robert kennedy
|
||||||
|
antoni kowalski
|
||||||
|
luna
|
||||||
|
paris-sg – lyon
|
||||||
|
arte live
|
||||||
|
dominik kohr
|
||||||
|
dumbledores geheimnisse
|
||||||
|
kampf der realitystars
|
||||||
|
kerner
|
||||||
|
tennessee
|
||||||
|
billy idol
|
||||||
|
kfc uerdingen
|
||||||
|
bastian pastewka
|
||||||
|
gnabry
|
||||||
|
lok leipzig heute live ticker
|
||||||
|
true lies wahre lügen
|
||||||
|
челси – манчестер юнайтед
|
||||||
|
nurburgring
|
||||||
|
fortnite server status
|
||||||
|
süperlig
|
||||||
|
ronaldinho
|
||||||
|
esther schweins let's dance
|
||||||
|
michael jackson film 2026
|
||||||
|
oliver pocher
|
||||||
|
die queen film
|
||||||
|
milano
|
||||||
|
straße von hormus
|
||||||
|
motsi mabuse
|
||||||
rayo vallecano
|
rayo vallecano
|
||||||
harry meghan
|
harry meghan
|
||||||
irland
|
irland
|
||||||
@@ -45,7 +169,6 @@ jeff bezos
|
|||||||
dan brown
|
dan brown
|
||||||
паспорт громадянина україни для виїзду за кордон
|
паспорт громадянина україни для виїзду за кордон
|
||||||
serena williams
|
serena williams
|
||||||
kampf der realitystars
|
|
||||||
манчестер юнайтед – лидс
|
манчестер юнайтед – лидс
|
||||||
catherine deneuve
|
catherine deneuve
|
||||||
bobzin
|
bobzin
|
||||||
|
|||||||
@@ -1,3 +1,126 @@
|
|||||||
|
heraldo de aragón
|
||||||
|
víctor muñoz villanueva
|
||||||
|
de tapas por españa
|
||||||
|
milan
|
||||||
|
aitana sánchez gijón
|
||||||
|
clasificacion liga
|
||||||
|
palencia
|
||||||
|
milan vs juventus
|
||||||
|
marseille – nice
|
||||||
|
cartagena fc
|
||||||
|
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
|
||||||
|
posiciones de la liga
|
||||||
|
resultados liga
|
||||||
|
lfp
|
||||||
|
umar sadiq
|
||||||
|
реал мадрид – алавес
|
||||||
|
jan virgili
|
||||||
|
moreirense - estoril
|
||||||
|
downton abbey
|
||||||
|
koldo garcía izaguirre
|
||||||
|
jorge martín
|
||||||
|
mike james
|
||||||
|
carla leite
|
||||||
|
eclipse solar del 12 de agosto de 2026
|
||||||
|
crystal palace - west ham
|
||||||
|
luz valdenebro
|
||||||
|
porto - tondela
|
||||||
|
santos - fluminense
|
||||||
|
juventus
|
||||||
|
almería - málaga
|
||||||
|
punjab kings vs lucknow super giants standings
|
||||||
|
mönchengladbach – mainz
|
||||||
|
victor eloy
|
||||||
|
paris-sg – lyon
|
||||||
|
psg vs lyon
|
||||||
|
zamora - osasuna b
|
||||||
|
estrecho
|
||||||
|
nurburgring
|
||||||
|
la 1 directo
|
||||||
|
oyarzabal
|
||||||
|
enrique cerezo
|
||||||
|
fraude
|
||||||
|
tasa
|
||||||
|
la 1
|
||||||
|
tve directo
|
||||||
|
cuántas copas del rey tiene la real sociedad
|
||||||
|
eugenia martínez de irujo
|
||||||
|
ccoo
|
||||||
|
racing de santander
|
||||||
|
racing
|
||||||
|
baliza v16
|
||||||
|
st. pauli – köln
|
||||||
|
iphone 18
|
||||||
|
st. pauli - colonia
|
||||||
|
nico paz
|
||||||
|
lionel messi
|
||||||
armengol
|
armengol
|
||||||
pau víctor
|
pau víctor
|
||||||
braga fc
|
braga fc
|
||||||
|
|||||||
@@ -1,3 +1,122 @@
|
|||||||
|
toulouse – clermont
|
||||||
|
martin short
|
||||||
|
le diable s'habille en prada 2 sortie
|
||||||
|
gautier larsonneur
|
||||||
|
milan vs juventus
|
||||||
|
stanley tucci
|
||||||
|
avs – sporting
|
||||||
|
lambert wilson
|
||||||
|
tochukwu nnadi
|
||||||
|
greenwood
|
||||||
|
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
|
||||||
|
margot haddad
|
||||||
|
ana riera
|
||||||
|
hinaupoko devèze
|
||||||
|
bruce toussaint
|
||||||
|
cheque energie
|
||||||
|
reid wiseman
|
||||||
|
loto 20 avril 2026
|
||||||
|
from serie
|
||||||
|
toulouse
|
||||||
|
racing 92 – stade français
|
||||||
|
juventus - bologna
|
||||||
|
film une annee difficile
|
||||||
|
échouement
|
||||||
|
programme tv ce soir
|
||||||
|
porto – tondela
|
||||||
|
matthieu pigasse
|
||||||
|
santos – fluminense
|
||||||
|
gta 6
|
||||||
|
laetitia milot
|
||||||
|
loto 18 avril 2026
|
||||||
|
bercy
|
||||||
|
pierre lellouche
|
||||||
|
adele
|
||||||
|
adil rami
|
||||||
|
castres – toulouse
|
||||||
|
angel
|
||||||
|
stéphane bern
|
||||||
|
anne claire coudray
|
||||||
|
pmu résultat
|
||||||
|
laury thilleman et paul mirabel
|
||||||
|
quinté du jour
|
||||||
|
euromillions 17 avril 2026
|
||||||
|
uson
|
||||||
|
guillaume meurice
|
||||||
|
pmu
|
||||||
|
grenoble – oyonnax
|
||||||
|
bagarre
|
||||||
programme télé
|
programme télé
|
||||||
tchernobyl
|
tchernobyl
|
||||||
géraldine maillet
|
géraldine maillet
|
||||||
@@ -44,7 +163,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,113 @@
|
|||||||
|
莫 雷 拉
|
||||||
|
蔡一傑
|
||||||
|
車路士
|
||||||
|
羅志祥
|
||||||
|
自助餐
|
||||||
|
馮盈盈
|
||||||
|
無時空之戀
|
||||||
|
方力申
|
||||||
|
可嵐
|
||||||
|
切爾西 對 里茲聯
|
||||||
|
谷 婭 溦
|
||||||
|
曼城
|
||||||
|
印度
|
||||||
|
英超
|
||||||
|
利物浦
|
||||||
|
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
|
||||||
|
江旻憓
|
||||||
|
陶傑
|
||||||
|
水晶宮 對 西漢姆聯
|
||||||
|
吉達艾阿里
|
||||||
|
山口智子
|
||||||
|
百佳超級市場
|
||||||
|
利息
|
||||||
|
戴祖儀
|
||||||
|
陳若思
|
||||||
|
麥當勞
|
||||||
|
首岸
|
||||||
|
中国商飞c919
|
||||||
|
bundesliga
|
||||||
|
hailey bieber
|
||||||
|
德甲
|
||||||
|
cherki
|
||||||
|
now
|
||||||
|
now tv
|
||||||
|
al nassr
|
||||||
|
洪金寶
|
||||||
|
曼聯
|
||||||
|
切爾西 對 曼聯
|
||||||
|
何沛珈
|
||||||
|
熱刺
|
||||||
|
tottenham vs brighton
|
||||||
|
熱刺 對 布萊頓
|
||||||
|
epl
|
||||||
|
司機
|
||||||
|
补贴
|
||||||
|
華富邨
|
||||||
|
零售
|
||||||
|
藍莓
|
||||||
|
商湯科技
|
||||||
|
周國豐
|
||||||
|
啟點
|
||||||
歐聯
|
歐聯
|
||||||
神戶勝利船
|
神戶勝利船
|
||||||
潘宏彬
|
潘宏彬
|
||||||
@@ -5,7 +115,6 @@
|
|||||||
木乃伊
|
木乃伊
|
||||||
ios 26
|
ios 26
|
||||||
李克寧木乃伊
|
李克寧木乃伊
|
||||||
江美儀
|
|
||||||
田啟文
|
田啟文
|
||||||
曼寧加
|
曼寧加
|
||||||
arsenal
|
arsenal
|
||||||
@@ -29,7 +138,6 @@ nba直播
|
|||||||
全民國家安全教育日
|
全民國家安全教育日
|
||||||
運輸署
|
運輸署
|
||||||
liverpool vs psg
|
liverpool vs psg
|
||||||
利物浦
|
|
||||||
barcelona
|
barcelona
|
||||||
歐冠
|
歐冠
|
||||||
馬德里競技 對 巴塞隆納
|
馬德里競技 對 巴塞隆納
|
||||||
|
|||||||
@@ -1,10 +1,130 @@
|
|||||||
|
ミラン 対 ユヴェントス
|
||||||
|
宇連ダム 貯水率
|
||||||
|
櫻坂46
|
||||||
|
与沢翼
|
||||||
|
岩手県 大槌町 山林火災
|
||||||
|
谷原章介
|
||||||
|
端午
|
||||||
|
週間天気予報
|
||||||
|
トリノ 対 インテル
|
||||||
|
佐野海舟
|
||||||
|
アーセナル
|
||||||
|
高岡蒼佑
|
||||||
|
マンチェスター・シティ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
|
||||||
|
加藤小夏
|
||||||
|
町田ゼルビア
|
||||||
|
モンスターハンターシリーズ
|
||||||
|
クリスタル・パレス 対 ウェストハム
|
||||||
|
吉田正尚
|
||||||
|
旭琉會
|
||||||
|
神戸
|
||||||
|
てんちむ
|
||||||
|
浜辺美波
|
||||||
|
デーブ ロバーツ
|
||||||
|
皇治
|
||||||
|
小雪
|
||||||
|
にじさんじデビュー
|
||||||
|
ちゃんよた
|
||||||
|
坂本 花織
|
||||||
|
松山 千春
|
||||||
|
リーグアン
|
||||||
|
伊勢谷友介
|
||||||
|
bayern vs vfb stuttgart
|
||||||
|
chelsea vs man united
|
||||||
|
唐田えりか
|
||||||
|
102回目のプロポーズ
|
||||||
|
デゼルビ
|
||||||
|
アトレティコ 対 ソシエダ
|
||||||
|
チェルシー 対 マンu
|
||||||
|
スパーズ
|
||||||
|
清春
|
||||||
|
ディエゴ・ゴメス
|
||||||
|
ps5
|
||||||
|
ハイウェイ の 堕 天使 興行 収入
|
||||||
|
カブス 対 メッツ
|
||||||
|
dazn
|
||||||
|
サッスオーロ 対 コモ
|
||||||
|
杉咲花
|
||||||
|
町田 対 アル・イテハド
|
||||||
|
家計
|
||||||
|
週末旅の極意
|
||||||
|
北斗の拳
|
||||||
|
qvc
|
||||||
小芝風花
|
小芝風花
|
||||||
中井亜美
|
中井亜美
|
||||||
afc u20女子アジアカップ
|
afc u20女子アジアカップ
|
||||||
ネオジオ
|
ネオジオ
|
||||||
uefaヨーロッパリーグ
|
uefaヨーロッパリーグ
|
||||||
加藤史帆
|
加藤史帆
|
||||||
町田ゼルビア
|
|
||||||
志田未来
|
志田未来
|
||||||
伊藤英明
|
伊藤英明
|
||||||
島田麻央
|
島田麻央
|
||||||
@@ -21,7 +141,6 @@ wowow
|
|||||||
小泉進次郎
|
小泉進次郎
|
||||||
政権
|
政権
|
||||||
ミキティ
|
ミキティ
|
||||||
ソニック
|
|
||||||
今日のドジャースの結果
|
今日のドジャースの結果
|
||||||
新名神高速道路
|
新名神高速道路
|
||||||
わたせせいぞう
|
わたせせいぞう
|
||||||
@@ -30,7 +149,6 @@ wowow
|
|||||||
アレックス・ベシア
|
アレックス・ベシア
|
||||||
リバプール
|
リバプール
|
||||||
champions league
|
champions league
|
||||||
エルニーニョ
|
|
||||||
アトレティコ 対 バルセロナ
|
アトレティコ 対 バルセロナ
|
||||||
オープンワールド
|
オープンワールド
|
||||||
atlético madrid vs barcelona
|
atlético madrid vs barcelona
|
||||||
|
|||||||
129
data/keywords/kw_KR.txt
Normal file
129
data/keywords/kw_KR.txt
Normal file
@@ -0,0 +1,129 @@
|
|||||||
|
세리에 a
|
||||||
|
암호화폐
|
||||||
|
수지
|
||||||
|
새마을금고
|
||||||
|
사주
|
||||||
|
차두리
|
||||||
|
평택시 을
|
||||||
|
야닉 시너
|
||||||
|
정성호
|
||||||
|
첼시
|
||||||
|
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
|
||||||
|
리그오브레전드
|
||||||
|
박환희
|
||||||
|
박지현
|
||||||
|
카토
|
||||||
|
와우넷
|
||||||
|
지구의 날
|
||||||
|
컴프야
|
||||||
|
차지연
|
||||||
|
크리스털 팰리스 대 웨스트 햄
|
||||||
|
비상계엄
|
||||||
|
연기금
|
||||||
|
배틀그라운드
|
||||||
|
제이홉
|
||||||
|
두산로보틱스
|
||||||
|
부부
|
||||||
|
미노이 우원재
|
||||||
|
danish malewar
|
||||||
|
mi vs gt
|
||||||
|
양치 승
|
||||||
|
프리미어리그
|
||||||
|
pl
|
||||||
|
bundesliga
|
||||||
|
맨체스터 시티 fc
|
||||||
|
fotmob
|
||||||
|
윤아
|
||||||
|
김영인
|
||||||
|
манчестер сити – арсенал
|
||||||
|
케이뱅크
|
||||||
|
날씨
|
||||||
|
환율
|
||||||
|
손흥민
|
||||||
|
토트넘 경기 일정
|
||||||
|
넷플릭스
|
||||||
|
국민은행
|
||||||
|
네이버웹툰
|
||||||
|
로또 당첨번호
|
||||||
|
쿠팡
|
||||||
|
KBO 리그
|
||||||
|
프로야구 순위
|
||||||
|
아이폰 15
|
||||||
|
챗gpt
|
||||||
|
인스타그램
|
||||||
|
유튜브 밴스드
|
||||||
|
이강인
|
||||||
|
김민재
|
||||||
|
LCK 일정
|
||||||
|
T1
|
||||||
|
페이커
|
||||||
|
무빙
|
||||||
|
카카오톡 PC버전
|
||||||
|
당근마켓
|
||||||
|
배달의민족
|
||||||
|
올리브영
|
||||||
|
메이플스토리
|
||||||
64
data/keywords/kw_MY.txt
Normal file
64
data/keywords/kw_MY.txt
Normal file
@@ -0,0 +1,64 @@
|
|||||||
|
milan vs juventus
|
||||||
|
osasuna vs sevilla
|
||||||
|
estrela amadora vs porto
|
||||||
|
lockheed martin
|
||||||
|
galatasaray vs fenerbahçe
|
||||||
|
polis
|
||||||
|
torino vs inter
|
||||||
|
terengganu fc
|
||||||
|
angkrish raghuvanshi
|
||||||
|
dortmund vs sc freiburg
|
||||||
|
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,123 @@
|
|||||||
|
passengers
|
||||||
|
finale wie is de mol
|
||||||
|
bourtange
|
||||||
|
marseille - nice
|
||||||
|
unchosen
|
||||||
|
prinses
|
||||||
|
sylvester stallone
|
||||||
|
28 years later
|
||||||
|
programma koningsdag 2026
|
||||||
|
milan - juventus
|
||||||
|
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
|
||||||
|
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
|
||||||
|
pogoda jutro
|
||||||
|
vierhouten
|
||||||
|
weather tomorrow
|
||||||
|
over mijn lijk 2026 overleden
|
||||||
|
crystal palace - west ham
|
||||||
|
f-16 fighting falcon
|
||||||
|
klagenfurt
|
||||||
|
italië
|
||||||
|
ruud gullit
|
||||||
|
perfil falso
|
||||||
|
psg - lyon
|
||||||
|
juventus - bologna
|
||||||
|
troy parrott
|
||||||
|
az - nec opstellingen
|
||||||
|
caroline tensen
|
||||||
|
asielbeleid
|
||||||
|
philippe sandler
|
||||||
|
keerbergen
|
||||||
|
peer koopmeiners
|
||||||
|
nederlands elftal
|
||||||
|
pogoń szczecin – lech poznań
|
||||||
|
stand premier league
|
||||||
|
bulgarije
|
||||||
|
chelsea - man utd
|
||||||
|
atlético madrid - real sociedad
|
||||||
|
xavi simons
|
||||||
|
ayase ueda
|
||||||
|
roma - atalanta
|
||||||
|
rtv noord
|
||||||
|
paraguay
|
||||||
|
sergio herman
|
||||||
|
fed
|
||||||
|
keuken kampioen
|
||||||
|
legia warszawa – zagłębie lubin
|
||||||
|
ripple
|
||||||
|
voorzitter fed
|
||||||
|
bahamas
|
||||||
|
overtreding
|
||||||
|
almere city
|
||||||
real betis
|
real betis
|
||||||
sean connery
|
sean connery
|
||||||
l1 nieuws
|
l1 nieuws
|
||||||
|
|||||||
@@ -1,3 +1,120 @@
|
|||||||
|
torino vs inter
|
||||||
|
dortmund vs sc freiburg
|
||||||
|
angkrish raghuvanshi
|
||||||
|
mohsin khan
|
||||||
|
running man
|
||||||
|
arsenal vs lyon
|
||||||
|
genoa vs como
|
||||||
|
kkr vs lsg
|
||||||
|
bwf
|
||||||
|
chelsea vs leeds
|
||||||
|
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
|
||||||
|
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
|
||||||
|
grok
|
||||||
|
gemini
|
||||||
|
claude ai
|
||||||
|
gpt
|
||||||
|
ai
|
||||||
|
is chatgpt down
|
||||||
|
strait of hormuz news
|
||||||
|
mi vs gt
|
||||||
|
psg vs lyon
|
||||||
|
sporting vs benfica
|
||||||
|
bayern munich
|
||||||
|
pl
|
||||||
|
bangkok weather
|
||||||
|
starhub
|
||||||
|
廖子妤
|
||||||
|
曼城 - 阿森纳
|
||||||
|
bayern vs vfb stuttgart
|
||||||
|
英超
|
||||||
|
chelsea vs man united
|
||||||
|
perfect crown
|
||||||
|
ayush mhatre
|
||||||
|
sarfaraz khan
|
||||||
|
napoli vs lazio
|
||||||
|
tottenham vs brighton
|
||||||
|
abhishek sharma
|
||||||
|
tinie tempah
|
||||||
|
wrexham vs stoke city
|
||||||
|
sassuolo vs como
|
||||||
|
the straits times
|
||||||
|
india women vs south africa women
|
||||||
|
beef season 2
|
||||||
|
loyang valley
|
||||||
|
world cup 2026
|
||||||
|
afc champions league
|
||||||
|
hormuz
|
||||||
|
malacca strait
|
||||||
|
kkr vs gt
|
||||||
aston villa vs bologna
|
aston villa vs bologna
|
||||||
mumbai indians vs punjab kings standings
|
mumbai indians vs punjab kings standings
|
||||||
al sadd vs vissel kobe
|
al sadd vs vissel kobe
|
||||||
|
|||||||
@@ -1,3 +1,120 @@
|
|||||||
|
航空
|
||||||
|
暴龍 對 騎士
|
||||||
|
王苡丞
|
||||||
|
遊戲
|
||||||
|
chelsea đấu với leeds
|
||||||
|
เชลซี พบ ลีดส์
|
||||||
|
聯發科技
|
||||||
|
詹姆士
|
||||||
|
田麗
|
||||||
|
token
|
||||||
|
兵工廠
|
||||||
|
魔術 對 活塞
|
||||||
|
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
|
||||||
|
底特律老虎
|
||||||
|
三 商 美邦
|
||||||
|
川 普
|
||||||
|
英雄聯盟
|
||||||
|
聯電adr
|
||||||
|
rklb
|
||||||
|
amd stock
|
||||||
|
宋仲基
|
||||||
|
德甲
|
||||||
|
塞爾提克 對 76人
|
||||||
|
justin bieber 演唱會
|
||||||
|
拜仁慕尼黑
|
||||||
|
何潤東
|
||||||
|
廖子妤
|
||||||
|
英超
|
||||||
|
許凱
|
||||||
|
tottenham vs brighton
|
||||||
|
長野縣
|
||||||
|
交通安全
|
||||||
|
朋友收集夢想生活
|
||||||
|
麥克傑克森
|
||||||
|
王濛
|
||||||
|
騎士 對 暴龍
|
||||||
|
熱刺 對 布萊頓
|
||||||
|
iem rio 2026
|
||||||
|
garret anderson
|
||||||
|
墓乃伊
|
||||||
|
曹格
|
||||||
|
claude design
|
||||||
|
柯文哲
|
||||||
|
金剛
|
||||||
|
荷 姆 茲 海峽
|
||||||
|
東北 季風
|
||||||
|
斯圖加特公開賽
|
||||||
歐聯
|
歐聯
|
||||||
菡生婦幼診所
|
菡生婦幼診所
|
||||||
台鐵訂票
|
台鐵訂票
|
||||||
@@ -5,7 +122,6 @@
|
|||||||
東光路
|
東光路
|
||||||
货币
|
货币
|
||||||
amd
|
amd
|
||||||
rklb
|
|
||||||
航空母艦
|
航空母艦
|
||||||
axti
|
axti
|
||||||
Yahoo奇摩
|
Yahoo奇摩
|
||||||
|
|||||||
@@ -1,3 +1,121 @@
|
|||||||
|
ronnie o'sullivan
|
||||||
|
janet cleverly councillor reprimanded
|
||||||
|
criminal record
|
||||||
|
mark selby
|
||||||
|
avs vs sporting
|
||||||
|
david attenborough
|
||||||
|
juventus
|
||||||
|
elena rybakina
|
||||||
|
eric bana
|
||||||
|
roman kemp
|
||||||
|
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
|
||||||
|
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
|
||||||
|
xrp ledger
|
||||||
|
pablo
|
||||||
|
is tane leaving home and away
|
||||||
|
julie andrews
|
||||||
|
danny boyle
|
||||||
|
nina eastenders
|
||||||
|
john stones
|
||||||
|
amazon vega os fire tv
|
||||||
|
porto vs tondela
|
||||||
|
santos vs fluminense
|
||||||
|
martin brundle lost f1 seat
|
||||||
|
keegan bradley
|
||||||
|
antoni kowalski
|
||||||
|
kezia dugdale
|
||||||
|
car
|
||||||
|
beef netflix
|
||||||
|
juventus vs bologna
|
||||||
|
losc vs nice
|
||||||
|
david szalay
|
||||||
|
the killer
|
||||||
|
joe cole
|
||||||
|
lille fc
|
||||||
|
simon cowell
|
||||||
|
pl
|
||||||
|
frank lampard everton
|
||||||
|
nottingham forest fixtures
|
||||||
|
everton manager
|
||||||
|
dragons vs bulls
|
||||||
|
suede
|
||||||
|
lahore
|
||||||
|
wrestlemania 2026
|
||||||
|
giants vs rhinos
|
||||||
|
glenrothan
|
||||||
|
york knights vs leopards
|
||||||
|
tim sherwood
|
||||||
|
redditch
|
||||||
|
ccfc
|
||||||
europa conference league
|
europa conference league
|
||||||
bromley fc
|
bromley fc
|
||||||
paul merton
|
paul merton
|
||||||
|
|||||||
@@ -1,3 +1,127 @@
|
|||||||
|
arthur rinderknech
|
||||||
|
avs vs sporting
|
||||||
|
elena rybakina
|
||||||
|
chris sale
|
||||||
|
bruins
|
||||||
|
sabres game
|
||||||
|
corinthians vs vasco
|
||||||
|
christian walker
|
||||||
|
where to watch new york yankees vs houston astros
|
||||||
|
gladiator ii
|
||||||
|
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
|
||||||
|
schd etf dividend yield
|
||||||
|
deportación
|
||||||
|
lecce - fiorentina
|
||||||
|
valley forge high school
|
||||||
|
betty yee
|
||||||
|
seth trimble
|
||||||
|
bill belichick
|
||||||
|
winter storm
|
||||||
|
jim parsons
|
||||||
|
kings vs avalanche
|
||||||
|
suns vs thunder
|
||||||
|
wolf
|
||||||
|
santos - fluminense
|
||||||
|
mets - cubs
|
||||||
|
alexander manninger
|
||||||
|
santos vs fluminense
|
||||||
|
disclosure day
|
||||||
|
tobias myers
|
||||||
|
vladimir putin
|
||||||
|
knicks game
|
||||||
|
ben rice
|
||||||
|
prem
|
||||||
|
timberwolves vs nuggets
|
||||||
|
cody bellinger
|
||||||
|
nik khamenia
|
||||||
|
real sociedad
|
||||||
|
nurburgring crash
|
||||||
|
atlético madrid - real sociedad
|
||||||
|
ruke orhorhoro
|
||||||
|
radar
|
||||||
|
the weather channel
|
||||||
|
kttc
|
||||||
|
luke gulbranson
|
||||||
|
kttc weather
|
||||||
|
comcast data breach settlement
|
||||||
|
tornado watch
|
||||||
|
moisés ballesteros
|
||||||
|
mets game today
|
||||||
giancarlo stanton
|
giancarlo stanton
|
||||||
real betis
|
real betis
|
||||||
prosecution of daniel duggan
|
prosecution of daniel duggan
|
||||||
|
|||||||
@@ -1,3 +1,120 @@
|
|||||||
|
juventus
|
||||||
|
milan đấu với juventus
|
||||||
|
villarreal đấu với celta
|
||||||
|
osasuna vs sevilla
|
||||||
|
galatasaray
|
||||||
|
michael jackson
|
||||||
|
sevilla
|
||||||
|
polymarket
|
||||||
|
mật ngữ kỷ
|
||||||
|
osasuna đấu với sevilla
|
||||||
|
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ư
|
||||||
|
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
|
||||||
|
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
|
||||||
|
fiorentina
|
||||||
|
crystal palace đấu với west ham
|
||||||
|
afc champions league
|
||||||
|
eduardo camavinga
|
||||||
|
vissel kobe
|
||||||
|
gemi
|
||||||
|
idp
|
||||||
|
bảo hiểm y tế
|
||||||
|
crystal palace vs west ham
|
||||||
|
sporting lisbon
|
||||||
|
psg vs lyon
|
||||||
|
ca sĩ
|
||||||
|
juventus đấu với bologna
|
||||||
|
gladbach đấu với mainz
|
||||||
|
twitch
|
||||||
|
psg đấu với lyon
|
||||||
|
ligue 1
|
||||||
|
trận đấu ngoại hạng anh
|
||||||
|
chelsea đấu với man utd
|
||||||
|
atlético madrid đấu với real sociedad
|
||||||
|
roma đấu với atalanta
|
||||||
|
epl
|
||||||
|
iem rio 2026
|
||||||
|
tot
|
||||||
|
tập đoàn gelex
|
||||||
|
đường ray
|
||||||
|
inter
|
||||||
|
inter đấu với cagliari
|
||||||
|
sassuolo vs como
|
||||||
|
david alaba
|
||||||
|
claude design
|
||||||
|
fenerbahçe đấu với rizespor
|
||||||
|
como
|
||||||
|
como vs
|
||||||
|
thẻ đỏ
|
||||||
porto vs
|
porto vs
|
||||||
crystal palace
|
crystal palace
|
||||||
porto
|
porto
|
||||||
@@ -27,7 +144,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
|
||||||
|
|||||||
270
data/map.json
270
data/map.json
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"version": "3.5.2",
|
"version": "3.5.2",
|
||||||
"updated_at": "2026-04-16",
|
"updated_at": "2026-04-19",
|
||||||
"continents": [
|
"continents": [
|
||||||
{
|
{
|
||||||
"id": "ASIA",
|
"id": "ASIA",
|
||||||
@@ -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,33 @@
|
|||||||
"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 (新加坡)"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "KR",
|
||||||
|
"name": "South Korea (韩国)",
|
||||||
|
"keyword_file": "kw_KR.txt",
|
||||||
|
"states": [
|
||||||
|
{
|
||||||
|
"id": "Default",
|
||||||
|
"name": "Default State",
|
||||||
|
"cities": [
|
||||||
|
{
|
||||||
|
"id": "Seoul",
|
||||||
|
"name": "Seoul (首尔)"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@@ -27,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 (香港)"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@@ -35,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 (河内)"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@@ -43,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 (吉隆坡)"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
@@ -61,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 (考文垂)"
|
||||||
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
@@ -72,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 (法兰克福)"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@@ -80,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 (巴黎)"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@@ -88,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 (阿姆斯特丹)"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@@ -96,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 (马德里)"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
@@ -114,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 (达拉斯)"
|
||||||
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
@@ -171,8 +326,77 @@
|
|||||||
"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 (蒙特利尔)"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "OCEANIA",
|
||||||
|
"name": "大洋洲战区 (Oceania)",
|
||||||
|
"countries": [
|
||||||
|
{
|
||||||
|
"id": "AU",
|
||||||
|
"name": "Australia (澳大利亚)",
|
||||||
|
"keyword_file": "kw_AU.txt",
|
||||||
|
"states": [
|
||||||
|
{
|
||||||
|
"id": "NSW",
|
||||||
|
"name": "New South Wales (新南威尔士州)",
|
||||||
|
"cities": [
|
||||||
|
{
|
||||||
|
"id": "Sydney",
|
||||||
|
"name": "Sydney (悉尼)"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "VIC",
|
||||||
|
"name": "Victoria (维多利亚州)",
|
||||||
|
"cities": [
|
||||||
|
{
|
||||||
|
"id": "Melbourne",
|
||||||
|
"name": "Melbourne (墨尔本)"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "QLD",
|
||||||
|
"name": "Queensland (昆士兰州)",
|
||||||
|
"cities": [
|
||||||
|
{
|
||||||
|
"id": "Brisbane",
|
||||||
|
"name": "Brisbane (布里斯班)"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "WA",
|
||||||
|
"name": "Western Australia (西澳大利亚州)",
|
||||||
|
"cities": [
|
||||||
|
{
|
||||||
|
"id": "Perth",
|
||||||
|
"name": "Perth (珀斯)"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "SA",
|
||||||
|
"name": "South Australia (南澳大利亚州)",
|
||||||
|
"cities": [
|
||||||
|
{
|
||||||
|
"id": "Adelaide",
|
||||||
|
"name": "Adelaide (阿德莱德)"
|
||||||
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
@@ -180,4 +404,4 @@
|
|||||||
]
|
]
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
50
data/regions/AU/NSW/Sydney.json
Normal file
50
data/regions/AU/NSW/Sydney.json
Normal file
@@ -0,0 +1,50 @@
|
|||||||
|
{
|
||||||
|
"region_name": "Australia - Sydney",
|
||||||
|
"google_module": {
|
||||||
|
"base_lat": -33.8697,
|
||||||
|
"base_lon": 151.2085,
|
||||||
|
"lang_params": "hl=en-AU&gl=AU",
|
||||||
|
"valid_url_suffix": "com.au"
|
||||||
|
},
|
||||||
|
"trust_module": {
|
||||||
|
"white_urls": [
|
||||||
|
"https://www.seek.com.au/",
|
||||||
|
"https://www.realestate.com.au/",
|
||||||
|
"https://www.abc.net.au/news/2026-04-26/trump-shooting-questions-mount/106609084",
|
||||||
|
"https://www.abc.net.au/news/2026-04-27/budget-recession-we-had-to-have-hormuz-oil-shock-iran/106607838",
|
||||||
|
"https://www.bom.gov.au/",
|
||||||
|
"https://www.abc.net.au/news/2026-04-27/us-allies-turn-to-japan-defence-supplies-as-iran-war-drags-on/106607656",
|
||||||
|
"https://www.abc.net.au/news/2026-04-26/trump-shooting-correspondent-dinner-washington/106608106",
|
||||||
|
"https://www.abc.net.au/news/2026-04-27/how-carrying-the-mental-load-drives-the-gender-sleep-gap/106474316",
|
||||||
|
"https://www.commbank.com.au/",
|
||||||
|
"https://www.ato.gov.au/",
|
||||||
|
"https://www.abc.net.au/news/2026-04-26/man-in-custody-after-assault-nurses-police-at-randwick-hospital/106608306",
|
||||||
|
"https://www.abc.net.au/news/2026-04-26/donald-trump-evacuated-during-shooting-in-washington-explained/106608156",
|
||||||
|
"https://www.abc.net.au/news/2026-04-26/sabastian-sawe-breaks-world-record-london-marathon/106609262",
|
||||||
|
"https://www.amazon.com.au/",
|
||||||
|
"https://www.abc.net.au/news/2026-04-26/israel-strikes-villages-in-lebanon-demands-residents-to-leave/106609282",
|
||||||
|
"https://my.gov.au/",
|
||||||
|
"https://www.abc.net.au/news/2026-04-27/chinese-marathon-runners-offered-subsidies-buy-property/106597978",
|
||||||
|
"https://www.coles.com.au/",
|
||||||
|
"https://www.abc.net.au/news/2026-04-26/george-pittar-wins-margaret-river-pro-first-wsl-title/106608282",
|
||||||
|
"https://www.abc.net.au/news/2026-04-26/david-crisafulli-no-acknowledgement-of-country/106607598",
|
||||||
|
"https://www.woolworths.com.au/",
|
||||||
|
"https://www.abc.net.au/news/2026-04-26/netherlands-buys-bushmaster-fleet-australia-commits-to-more/106608000",
|
||||||
|
"https://www.abc.net.au/news/2026-04-26/nsw-beaches-to-remain-closed-due-to-whale-carcass/106607784",
|
||||||
|
"https://www.abc.net.au/news/2026-04-27/trump-shooting-media-shared-experience/106608330",
|
||||||
|
"https://www.bunnings.com.au/"
|
||||||
|
],
|
||||||
|
"static_urls": [
|
||||||
|
"https://my.gov.au/",
|
||||||
|
"https://www.ato.gov.au/",
|
||||||
|
"https://www.bom.gov.au/",
|
||||||
|
"https://www.commbank.com.au/",
|
||||||
|
"https://www.seek.com.au/",
|
||||||
|
"https://www.realestate.com.au/",
|
||||||
|
"https://www.woolworths.com.au/",
|
||||||
|
"https://www.coles.com.au/",
|
||||||
|
"https://www.amazon.com.au/",
|
||||||
|
"https://www.bunnings.com.au/"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
50
data/regions/AU/QLD/Brisbane.json
Normal file
50
data/regions/AU/QLD/Brisbane.json
Normal file
@@ -0,0 +1,50 @@
|
|||||||
|
{
|
||||||
|
"region_name": "Australia - Brisbane",
|
||||||
|
"google_module": {
|
||||||
|
"base_lat": -27.4697,
|
||||||
|
"base_lon": 153.0252,
|
||||||
|
"lang_params": "hl=en-AU&gl=AU",
|
||||||
|
"valid_url_suffix": "com.au"
|
||||||
|
},
|
||||||
|
"trust_module": {
|
||||||
|
"white_urls": [
|
||||||
|
"https://www.abc.net.au/news/2026-04-26/donald-trump-evacuated-during-shooting-in-washington-explained/106608156",
|
||||||
|
"https://www.commbank.com.au/",
|
||||||
|
"https://www.abc.net.au/news/2026-04-27/how-carrying-the-mental-load-drives-the-gender-sleep-gap/106474316",
|
||||||
|
"https://www.abc.net.au/news/2026-04-27/us-allies-turn-to-japan-defence-supplies-as-iran-war-drags-on/106607656",
|
||||||
|
"https://www.abc.net.au/news/2026-04-27/trump-shooting-media-shared-experience/106608330",
|
||||||
|
"https://www.abc.net.au/news/2026-04-26/trump-shooting-questions-mount/106609084",
|
||||||
|
"https://www.abc.net.au/news/2026-04-26/netherlands-buys-bushmaster-fleet-australia-commits-to-more/106608000",
|
||||||
|
"https://www.amazon.com.au/",
|
||||||
|
"https://www.realestate.com.au/",
|
||||||
|
"https://www.abc.net.au/news/2026-04-26/david-crisafulli-no-acknowledgement-of-country/106607598",
|
||||||
|
"https://www.bunnings.com.au/",
|
||||||
|
"https://www.abc.net.au/news/2026-04-26/sabastian-sawe-breaks-world-record-london-marathon/106609262",
|
||||||
|
"https://www.abc.net.au/news/2026-04-26/george-pittar-wins-margaret-river-pro-first-wsl-title/106608282",
|
||||||
|
"https://www.woolworths.com.au/",
|
||||||
|
"https://www.abc.net.au/news/2026-04-26/nsw-beaches-to-remain-closed-due-to-whale-carcass/106607784",
|
||||||
|
"https://www.abc.net.au/news/2026-04-26/israel-strikes-villages-in-lebanon-demands-residents-to-leave/106609282",
|
||||||
|
"https://www.coles.com.au/",
|
||||||
|
"https://www.abc.net.au/news/2026-04-26/trump-shooting-correspondent-dinner-washington/106608106",
|
||||||
|
"https://www.abc.net.au/news/2026-04-27/budget-recession-we-had-to-have-hormuz-oil-shock-iran/106607838",
|
||||||
|
"https://www.abc.net.au/news/2026-04-26/man-in-custody-after-assault-nurses-police-at-randwick-hospital/106608306",
|
||||||
|
"https://www.seek.com.au/",
|
||||||
|
"https://www.abc.net.au/news/2026-04-27/chinese-marathon-runners-offered-subsidies-buy-property/106597978",
|
||||||
|
"https://my.gov.au/",
|
||||||
|
"https://www.bom.gov.au/",
|
||||||
|
"https://www.ato.gov.au/"
|
||||||
|
],
|
||||||
|
"static_urls": [
|
||||||
|
"https://my.gov.au/",
|
||||||
|
"https://www.ato.gov.au/",
|
||||||
|
"https://www.bom.gov.au/",
|
||||||
|
"https://www.commbank.com.au/",
|
||||||
|
"https://www.seek.com.au/",
|
||||||
|
"https://www.realestate.com.au/",
|
||||||
|
"https://www.woolworths.com.au/",
|
||||||
|
"https://www.coles.com.au/",
|
||||||
|
"https://www.amazon.com.au/",
|
||||||
|
"https://www.bunnings.com.au/"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
50
data/regions/AU/SA/Adelaide.json
Normal file
50
data/regions/AU/SA/Adelaide.json
Normal file
@@ -0,0 +1,50 @@
|
|||||||
|
{
|
||||||
|
"region_name": "Australia - Adelaide",
|
||||||
|
"google_module": {
|
||||||
|
"base_lat": -34.9227,
|
||||||
|
"base_lon": 138.6016,
|
||||||
|
"lang_params": "hl=en-AU&gl=AU",
|
||||||
|
"valid_url_suffix": "com.au"
|
||||||
|
},
|
||||||
|
"trust_module": {
|
||||||
|
"white_urls": [
|
||||||
|
"https://www.abc.net.au/news/2026-04-26/george-pittar-wins-margaret-river-pro-first-wsl-title/106608282",
|
||||||
|
"https://www.abc.net.au/news/2026-04-27/us-allies-turn-to-japan-defence-supplies-as-iran-war-drags-on/106607656",
|
||||||
|
"https://www.abc.net.au/news/2026-04-26/man-in-custody-after-assault-nurses-police-at-randwick-hospital/106608306",
|
||||||
|
"https://www.abc.net.au/news/2026-04-26/sabastian-sawe-breaks-world-record-london-marathon/106609262",
|
||||||
|
"https://www.abc.net.au/news/2026-04-26/trump-shooting-correspondent-dinner-washington/106608106",
|
||||||
|
"https://www.abc.net.au/news/2026-04-26/netherlands-buys-bushmaster-fleet-australia-commits-to-more/106608000",
|
||||||
|
"https://www.bom.gov.au/",
|
||||||
|
"https://my.gov.au/",
|
||||||
|
"https://www.abc.net.au/news/2026-04-26/donald-trump-evacuated-during-shooting-in-washington-explained/106608156",
|
||||||
|
"https://www.abc.net.au/news/2026-04-26/trump-shooting-questions-mount/106609084",
|
||||||
|
"https://www.abc.net.au/news/2026-04-26/david-crisafulli-no-acknowledgement-of-country/106607598",
|
||||||
|
"https://www.ato.gov.au/",
|
||||||
|
"https://www.woolworths.com.au/",
|
||||||
|
"https://www.bunnings.com.au/",
|
||||||
|
"https://www.abc.net.au/news/2026-04-27/chinese-marathon-runners-offered-subsidies-buy-property/106597978",
|
||||||
|
"https://www.commbank.com.au/",
|
||||||
|
"https://www.seek.com.au/",
|
||||||
|
"https://www.abc.net.au/news/2026-04-27/budget-recession-we-had-to-have-hormuz-oil-shock-iran/106607838",
|
||||||
|
"https://www.abc.net.au/news/2026-04-26/nsw-beaches-to-remain-closed-due-to-whale-carcass/106607784",
|
||||||
|
"https://www.coles.com.au/",
|
||||||
|
"https://www.abc.net.au/news/2026-04-27/how-carrying-the-mental-load-drives-the-gender-sleep-gap/106474316",
|
||||||
|
"https://www.realestate.com.au/",
|
||||||
|
"https://www.abc.net.au/news/2026-04-26/israel-strikes-villages-in-lebanon-demands-residents-to-leave/106609282",
|
||||||
|
"https://www.abc.net.au/news/2026-04-27/trump-shooting-media-shared-experience/106608330",
|
||||||
|
"https://www.amazon.com.au/"
|
||||||
|
],
|
||||||
|
"static_urls": [
|
||||||
|
"https://my.gov.au/",
|
||||||
|
"https://www.ato.gov.au/",
|
||||||
|
"https://www.bom.gov.au/",
|
||||||
|
"https://www.commbank.com.au/",
|
||||||
|
"https://www.seek.com.au/",
|
||||||
|
"https://www.realestate.com.au/",
|
||||||
|
"https://www.woolworths.com.au/",
|
||||||
|
"https://www.coles.com.au/",
|
||||||
|
"https://www.amazon.com.au/",
|
||||||
|
"https://www.bunnings.com.au/"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
50
data/regions/AU/VIC/Melbourne.json
Normal file
50
data/regions/AU/VIC/Melbourne.json
Normal file
@@ -0,0 +1,50 @@
|
|||||||
|
{
|
||||||
|
"region_name": "Australia - Melbourne",
|
||||||
|
"google_module": {
|
||||||
|
"base_lat": -37.8106,
|
||||||
|
"base_lon": 144.9624,
|
||||||
|
"lang_params": "hl=en-AU&gl=AU",
|
||||||
|
"valid_url_suffix": "com.au"
|
||||||
|
},
|
||||||
|
"trust_module": {
|
||||||
|
"white_urls": [
|
||||||
|
"https://www.ato.gov.au/",
|
||||||
|
"https://www.abc.net.au/news/2026-04-26/sabastian-sawe-breaks-world-record-london-marathon/106609262",
|
||||||
|
"https://www.woolworths.com.au/",
|
||||||
|
"https://www.seek.com.au/",
|
||||||
|
"https://www.abc.net.au/news/2026-04-27/chinese-marathon-runners-offered-subsidies-buy-property/106597978",
|
||||||
|
"https://www.abc.net.au/news/2026-04-26/man-in-custody-after-assault-nurses-police-at-randwick-hospital/106608306",
|
||||||
|
"https://www.commbank.com.au/",
|
||||||
|
"https://www.abc.net.au/news/2026-04-26/nsw-beaches-to-remain-closed-due-to-whale-carcass/106607784",
|
||||||
|
"https://www.abc.net.au/news/2026-04-26/netherlands-buys-bushmaster-fleet-australia-commits-to-more/106608000",
|
||||||
|
"https://www.bunnings.com.au/",
|
||||||
|
"https://www.abc.net.au/news/2026-04-26/donald-trump-evacuated-during-shooting-in-washington-explained/106608156",
|
||||||
|
"https://www.abc.net.au/news/2026-04-26/george-pittar-wins-margaret-river-pro-first-wsl-title/106608282",
|
||||||
|
"https://www.abc.net.au/news/2026-04-26/trump-shooting-questions-mount/106609084",
|
||||||
|
"https://www.abc.net.au/news/2026-04-27/us-allies-turn-to-japan-defence-supplies-as-iran-war-drags-on/106607656",
|
||||||
|
"https://www.abc.net.au/news/2026-04-26/trump-shooting-correspondent-dinner-washington/106608106",
|
||||||
|
"https://www.coles.com.au/",
|
||||||
|
"https://www.realestate.com.au/",
|
||||||
|
"https://my.gov.au/",
|
||||||
|
"https://www.abc.net.au/news/2026-04-27/budget-recession-we-had-to-have-hormuz-oil-shock-iran/106607838",
|
||||||
|
"https://www.abc.net.au/news/2026-04-27/how-carrying-the-mental-load-drives-the-gender-sleep-gap/106474316",
|
||||||
|
"https://www.abc.net.au/news/2026-04-26/israel-strikes-villages-in-lebanon-demands-residents-to-leave/106609282",
|
||||||
|
"https://www.abc.net.au/news/2026-04-27/trump-shooting-media-shared-experience/106608330",
|
||||||
|
"https://www.abc.net.au/news/2026-04-26/david-crisafulli-no-acknowledgement-of-country/106607598",
|
||||||
|
"https://www.amazon.com.au/",
|
||||||
|
"https://www.bom.gov.au/"
|
||||||
|
],
|
||||||
|
"static_urls": [
|
||||||
|
"https://my.gov.au/",
|
||||||
|
"https://www.ato.gov.au/",
|
||||||
|
"https://www.bom.gov.au/",
|
||||||
|
"https://www.commbank.com.au/",
|
||||||
|
"https://www.seek.com.au/",
|
||||||
|
"https://www.realestate.com.au/",
|
||||||
|
"https://www.woolworths.com.au/",
|
||||||
|
"https://www.coles.com.au/",
|
||||||
|
"https://www.amazon.com.au/",
|
||||||
|
"https://www.bunnings.com.au/"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
50
data/regions/AU/WA/Perth.json
Normal file
50
data/regions/AU/WA/Perth.json
Normal file
@@ -0,0 +1,50 @@
|
|||||||
|
{
|
||||||
|
"region_name": "Australia - Perth",
|
||||||
|
"google_module": {
|
||||||
|
"base_lat": -31.9545,
|
||||||
|
"base_lon": 115.8582,
|
||||||
|
"lang_params": "hl=en-AU&gl=AU",
|
||||||
|
"valid_url_suffix": "com.au"
|
||||||
|
},
|
||||||
|
"trust_module": {
|
||||||
|
"white_urls": [
|
||||||
|
"https://www.abc.net.au/news/2026-04-26/george-pittar-wins-margaret-river-pro-first-wsl-title/106608282",
|
||||||
|
"https://www.abc.net.au/news/2026-04-26/israel-strikes-villages-in-lebanon-demands-residents-to-leave/106609282",
|
||||||
|
"https://www.abc.net.au/news/2026-04-26/nsw-beaches-to-remain-closed-due-to-whale-carcass/106607784",
|
||||||
|
"https://www.abc.net.au/news/2026-04-27/us-allies-turn-to-japan-defence-supplies-as-iran-war-drags-on/106607656",
|
||||||
|
"https://www.woolworths.com.au/",
|
||||||
|
"https://my.gov.au/",
|
||||||
|
"https://www.seek.com.au/",
|
||||||
|
"https://www.realestate.com.au/",
|
||||||
|
"https://www.abc.net.au/news/2026-04-27/trump-shooting-media-shared-experience/106608330",
|
||||||
|
"https://www.coles.com.au/",
|
||||||
|
"https://www.ato.gov.au/",
|
||||||
|
"https://www.bom.gov.au/",
|
||||||
|
"https://www.abc.net.au/news/2026-04-27/how-carrying-the-mental-load-drives-the-gender-sleep-gap/106474316",
|
||||||
|
"https://www.abc.net.au/news/2026-04-26/sabastian-sawe-breaks-world-record-london-marathon/106609262",
|
||||||
|
"https://www.abc.net.au/news/2026-04-26/trump-shooting-correspondent-dinner-washington/106608106",
|
||||||
|
"https://www.abc.net.au/news/2026-04-26/david-crisafulli-no-acknowledgement-of-country/106607598",
|
||||||
|
"https://www.amazon.com.au/",
|
||||||
|
"https://www.abc.net.au/news/2026-04-26/man-in-custody-after-assault-nurses-police-at-randwick-hospital/106608306",
|
||||||
|
"https://www.abc.net.au/news/2026-04-26/trump-shooting-questions-mount/106609084",
|
||||||
|
"https://www.commbank.com.au/",
|
||||||
|
"https://www.abc.net.au/news/2026-04-27/chinese-marathon-runners-offered-subsidies-buy-property/106597978",
|
||||||
|
"https://www.abc.net.au/news/2026-04-27/budget-recession-we-had-to-have-hormuz-oil-shock-iran/106607838",
|
||||||
|
"https://www.abc.net.au/news/2026-04-26/netherlands-buys-bushmaster-fleet-australia-commits-to-more/106608000",
|
||||||
|
"https://www.bunnings.com.au/",
|
||||||
|
"https://www.abc.net.au/news/2026-04-26/donald-trump-evacuated-during-shooting-in-washington-explained/106608156"
|
||||||
|
],
|
||||||
|
"static_urls": [
|
||||||
|
"https://my.gov.au/",
|
||||||
|
"https://www.ato.gov.au/",
|
||||||
|
"https://www.bom.gov.au/",
|
||||||
|
"https://www.commbank.com.au/",
|
||||||
|
"https://www.seek.com.au/",
|
||||||
|
"https://www.realestate.com.au/",
|
||||||
|
"https://www.woolworths.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/world/us-iran-pakistan-talks-9.7177261?cmp=rss",
|
||||||
"https://www.cbc.ca/",
|
"https://www.rbcroyalbank.com/",
|
||||||
|
"https://www.cbc.ca/news/canada/vegetable-prices-canada-9.7173027?cmp=rss",
|
||||||
|
"https://www.theweathernetwork.com/ca",
|
||||||
|
"https://www.cbc.ca/news/science/amoc-slowdown-9.7176387?cmp=rss",
|
||||||
|
"https://www.cbc.ca/news/canada/school-supports-safety-asd-9.7173882?cmp=rss",
|
||||||
|
"https://www.cbc.ca/news/politics/lithuania-canada-economic-warfare-trade-9.7176557?cmp=rss",
|
||||||
|
"https://www.cbc.ca/radio/thecurrent/freebirthing-rural-maternal-medicine-9.7172199?cmp=rss",
|
||||||
|
"https://www.cbc.ca/news/canada/edmonton/hwy-63-fort-mcmurray-snow-storm-stranded-9.7177581?cmp=rss",
|
||||||
|
"https://www.amazon.ca/",
|
||||||
|
"https://www.utoronto.ca/",
|
||||||
|
"https://www.cbc.ca/news/canada/british-columbia/man-dies-after-falling-from-stawamus-chief-9.7177477?cmp=rss",
|
||||||
|
"https://www.cbc.ca/news/canada/british-columbia/homelessness-seniors-robert-mah-9.7175702?cmp=rss",
|
||||||
|
"https://www.cbc.ca/news/canada/manitoba/manitoba-kinew-megaprojects-analysis-9.7177015?cmp=rss",
|
||||||
|
"https://www.cra-arc.gc.ca/",
|
||||||
|
"https://www.td.com/",
|
||||||
|
"https://www.cbc.ca/news/canada/british-columbia/kelowna-vibrant-vine-bankruptcy-receivership-9.7175690?cmp=rss",
|
||||||
|
"https://www.cbc.ca/news/canada/nova-scotia/sujit-acharya-momonepal-acadia-frank-h-sobey-scholarship-9.7176324?cmp=rss",
|
||||||
|
"https://www.canada.ca/en.html",
|
||||||
|
"https://www.canadapost-postescanada.ca/",
|
||||||
|
"https://www.cbc.ca/news/canada/first-person-autism-partial-schooling-9.7175015?cmp=rss",
|
||||||
|
"https://www.cbc.ca/news/health/lipoprotein-a-heart-attack-stroke-screening-9.7174934?cmp=rss",
|
||||||
|
"https://www.cbc.ca/news/politics/poilievre-carney-budget-update-us-trade-war-donald-trump-tariffs-9.7177934?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/politics/poilievre-carney-budget-update-us-trade-war-donald-trump-tariffs-9.7177934?cmp=rss",
|
||||||
|
"https://www.cbc.ca/news/canada/vegetable-prices-canada-9.7173027?cmp=rss",
|
||||||
"https://www.canada.ca/en.html",
|
"https://www.canada.ca/en.html",
|
||||||
"https://www.cbc.ca/",
|
"https://www.cbc.ca/news/canada/edmonton/hwy-63-fort-mcmurray-snow-storm-stranded-9.7177581?cmp=rss",
|
||||||
"https://www.thestar.com/",
|
"https://www.utoronto.ca/",
|
||||||
"https://www.ctvnews.ca/",
|
"https://www.cbc.ca/news/canada/british-columbia/homelessness-seniors-robert-mah-9.7175702?cmp=rss",
|
||||||
|
"https://www.cbc.ca/radio/thecurrent/freebirthing-rural-maternal-medicine-9.7172199?cmp=rss",
|
||||||
"https://www.canadapost-postescanada.ca/",
|
"https://www.canadapost-postescanada.ca/",
|
||||||
"https://www.td.com/"
|
"https://www.cbc.ca/news/science/amoc-slowdown-9.7176387?cmp=rss",
|
||||||
|
"https://www.cbc.ca/news/canada/british-columbia/man-dies-after-falling-from-stawamus-chief-9.7177477?cmp=rss",
|
||||||
|
"https://www.amazon.ca/",
|
||||||
|
"https://www.rbcroyalbank.com/",
|
||||||
|
"https://www.theweathernetwork.com/ca",
|
||||||
|
"https://www.cbc.ca/news/canada/nova-scotia/sujit-acharya-momonepal-acadia-frank-h-sobey-scholarship-9.7176324?cmp=rss",
|
||||||
|
"https://www.cbc.ca/news/politics/lithuania-canada-economic-warfare-trade-9.7176557?cmp=rss",
|
||||||
|
"https://www.cbc.ca/news/health/lipoprotein-a-heart-attack-stroke-screening-9.7174934?cmp=rss",
|
||||||
|
"https://www.cbc.ca/news/canada/manitoba/manitoba-kinew-megaprojects-analysis-9.7177015?cmp=rss",
|
||||||
|
"https://www.cbc.ca/news/canada/first-person-autism-partial-schooling-9.7175015?cmp=rss",
|
||||||
|
"https://www.cbc.ca/news/canada/school-supports-safety-asd-9.7173882?cmp=rss",
|
||||||
|
"https://www.cbc.ca/news/canada/british-columbia/kelowna-vibrant-vine-bankruptcy-receivership-9.7175690?cmp=rss",
|
||||||
|
"https://www.cra-arc.gc.ca/",
|
||||||
|
"https://www.td.com/",
|
||||||
|
"https://www.cbc.ca/news/world/us-iran-pakistan-talks-9.7177261?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.theweathernetwork.com/ca"
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -8,13 +8,39 @@
|
|||||||
},
|
},
|
||||||
"trust_module": {
|
"trust_module": {
|
||||||
"white_urls": [
|
"white_urls": [
|
||||||
"https://www.amazon.de/",
|
"https://www.bahn.de/",
|
||||||
"https://www.spiegel.de/",
|
|
||||||
"https://www.tagesschau.de/",
|
|
||||||
"https://de.wikipedia.org/wiki/Spezial:Zuf%C3%A4llige_Seite",
|
|
||||||
"https://www.ebay.de/",
|
"https://www.ebay.de/",
|
||||||
"https://www.bild.de/",
|
"https://www.tagesschau.de/ausland/europa/ukraine-russland-angriffe-154.html",
|
||||||
"https://www.kicker.de/"
|
"https://www.arbeitsagentur.de/",
|
||||||
|
"https://www.bundesregierung.de/",
|
||||||
|
"https://www.tagesschau.de/ausland/asien/usbekistan-rohstoffe-100.html",
|
||||||
|
"https://www.tagesschau.de/wissen/forschung/buergerforschung-citizen-science-100.html",
|
||||||
|
"https://www.tagesschau.de/inland/innenpolitik/merz-rente-rede-100.html",
|
||||||
|
"https://www.tagesschau.de/ausland/afrika/mali-angriffe-100.html",
|
||||||
|
"https://www.spiegel.de/",
|
||||||
|
"https://www.tagesschau.de/ausland/europa/ukraine-eisenbahn-angriffe-100.html",
|
||||||
|
"https://www.tum.de/",
|
||||||
|
"https://www.tagesschau.de/inland/innenpolitik/energieknappheit-kerosin-nouripour-100.html",
|
||||||
|
"https://www.tagesschau.de/wirtschaft/verbraucher/bargeld-geldautomaten-100.html",
|
||||||
|
"https://www.sparkasse.de/",
|
||||||
|
"https://www.tagesschau.de/ausland/amerika/trump-korrespondentendinner-100.html",
|
||||||
|
"https://www.tagesschau.de/ausland/asien/iran-usa-gespraeche-100.html",
|
||||||
|
"https://www.tagesschau.de/ausland/asien/kommunalwahl-westjordanland-100.html",
|
||||||
|
"https://www.tagesschau.de/wissen/technologie/40-jahre-tschernobyl-hintergrund-100.html",
|
||||||
|
"https://www.tagesschau.de/ausland/europa/orban-parlamentsmandat-100.html",
|
||||||
|
"https://www.tagesschau.de/wirtschaft/verbraucher/hausverwaltung-immobilie-betrug-100.html",
|
||||||
|
"https://www.amazon.de/",
|
||||||
|
"https://www.tagesschau.de/ausland/amerika/usa-reaktionen-schuesse-korrespondentendinner-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://administracion.gob.es/",
|
||||||
"https://www.elmundo.es/",
|
"https://elpais.com/internacional/2026-04-26/intento-de-atentado-a-donald-trump-en-la-cena-de-corresponsales-de-la-casa-blanca.html",
|
||||||
"https://www.elpais.com/",
|
"https://www.elcorteingles.es/",
|
||||||
"https://www.marca.com/",
|
"https://elpais.com/videos/2026-04-26/los-periodistas-son-los-testigos-los-testimonios-del-tiroteo-en-la-cena-de-corresponsales-de-la-casa-blanca.html",
|
||||||
"https://www.rtve.es/",
|
"https://elpais.com/ciencia/2026-04-26/la-odisea-para-sobrevivir-de-la-tortuga-que-desova-a-2000-kilometros-de-donde-nacio-hacen-esto-desde-la-epoca-de-los-dinosaurios.html",
|
||||||
|
"https://elpais.com/gente/2026-04-25/el-regreso-de-laura-esquivel-y-brenda-asnicar-de-patito-feo-queremos-contar-otra-historia-hay-que-mirarse-al-espejo-y-quererse.html",
|
||||||
|
"https://www.renfe.com/",
|
||||||
|
"https://elpais.com/espana/2026-04-26/nacer-en-una-secta-asi-destruyo-el-tio-toni-a-tres-generaciones-de-una-familia.html",
|
||||||
|
"https://www.agenciatributaria.es/",
|
||||||
|
"https://elpais.com/sociedad/2026-04-25/las-victimas-se-quejan-del-oscurantismo-de-la-iglesia-en-las-reparaciones-soy-el-afectado-y-me-niegan-la-documentacion.html",
|
||||||
|
"https://www.zara.com/es/",
|
||||||
|
"https://elpais.com/internacional/2026-04-26/la-llave-geopolitica-del-orden-venidero.html",
|
||||||
|
"https://elpais.com/internacional/2026-04-26/cientificos-desaparecidos-o-muertos-la-teoria-de-la-conspiracion-que-investigan-el-fbi-y-el-congreso-de-estados-unidos.html",
|
||||||
|
"https://www.santander.es/",
|
||||||
|
"https://elpais.com/espana/catalunya/2026-04-26/muere-a-los-44-anos-la-activista-maria-campuzano-referente-en-la-lucha-contra-la-pobreza-energetica.html",
|
||||||
|
"https://elpais.com/educacion/2026-04-26/meter-policias-la-polemica-formula-para-frenar-el-aumento-de-la-conflictividad-en-los-centros-educativos.html",
|
||||||
|
"https://elpais.com/internacional/2026-04-25/fuerzas-rebeldes-atacan-varios-puntos-de-mali.html",
|
||||||
|
"https://elpais.com/videos/2026-04-26/el-momento-de-la-evacuacion-del-vicepresiente-de-ee-uu-jd-vance-de-la-cena-de-corresponsales-tras-el-tiroteo.html",
|
||||||
|
"https://elpais.com/smoda/2026-04-26/donaciones-de-sangre-activismo-y-empatia-asi-ayudaron-las-lesbianas-a-la-lucha-contra-el-vih.html",
|
||||||
|
"https://www.amazon.es/",
|
||||||
|
"https://elpais.com/us/2026-04-26/el-atacante-de-la-cena-de-corresponsales-un-maestro-californiano-de-31-anos-esta-detenido.html",
|
||||||
|
"https://elpais.com/gente/2026-04-24/el-hijo-mayor-de-los-reiner-escribe-por-primera-vez-del-asesinato-de-sus-padres-perdimos-a-mas-de-la-mitad-de-nuestra-familia-de-la-forma-mas-violenta-que-se-pueda-imaginar.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.lefigaro.fr/",
|
|
||||||
"https://www.amazon.fr/",
|
|
||||||
"https://www.service-public.fr/",
|
"https://www.service-public.fr/",
|
||||||
"https://fr.wikipedia.org/wiki/Sp%C3%A9cial:Page_au_hasard",
|
"https://www.france24.com/fr/vid%C3%A9o/20260426-mali-les-jihadistes-du-jnim-affili%C3%A9-%C3%A0-al-qa%C3%AFda-revendiquent-les-attaques",
|
||||||
|
"https://www.france24.com/fr/vid%C3%A9o/20260426-m%C3%A9moire-journ%C3%A9e-nationale-de-souvenir-des-victimes-de-la-d%C3%A9portation",
|
||||||
|
"https://www.impots.gouv.fr/",
|
||||||
|
"https://www.france24.com/fr/vid%C3%A9o/20260426-prise-de-parole-de-donald-trump-apr%C3%A8s-l-incident-des-tirs-%C3%A0-un-gala-%C3%A0-washington",
|
||||||
"https://www.cdiscount.com/",
|
"https://www.cdiscount.com/",
|
||||||
"https://www.fnac.com/"
|
"https://www.credit-agricole.fr/",
|
||||||
|
"https://www.france24.com/fr/vid%C3%A9o/20260426-tirs-au-d%C3%AEner-des-correspondants-de-la-maison-blanche-le-suspect-arr%C3%AAt%C3%A9",
|
||||||
|
"https://www.sncf.com/",
|
||||||
|
"https://www.france24.com/fr/moyen-orient/20260426-trump-diner-presse-amal-khalil-journaliste-tuee-liban-leon-xiv-robots-pekin-la-semaine-en-images",
|
||||||
|
"https://www.france24.com/fr/vid%C3%A9o/20260426-ukraine-40-ans-apr%C3%A8s-tchernobyl-une-centrale-dans-la-guerre",
|
||||||
|
"https://www.france24.com/fr/%C3%A9missions/sports/20260426-psg-s-envole-titre-apr%C3%A8s-large-victoire-angers-ligue-1",
|
||||||
|
"https://www.france24.com/fr/afrique/20260426-mali-reprise-des-combats-%C3%A0-kidal-entre-l-arm%C3%A9e-et-les-rebelles-touareg-alli%C3%A9s-aux-jihadistes",
|
||||||
|
"https://www.france24.com/fr/vid%C3%A9o/20260426-mali-reprise-des-combats-%C3%A0-kidal-et-dans-le-fief-de-la-junte",
|
||||||
|
"https://www.france24.com/fr/vid%C3%A9o/20260426-mali-le-ministre-de-la-d%C3%A9fense-sadio-camara-tu%C3%A9-dans-une-attaque-%C3%A0-kati",
|
||||||
|
"https://www.sorbonne-universite.fr/",
|
||||||
|
"https://www.france24.com/fr/am%C3%A9riques/20260426-en-direct-keir-starmer-choqu%C3%A9-r%C3%A9actions-tirs-gala-correspondants-presse-auquel-assistait-donald-trump",
|
||||||
|
"https://www.amazon.fr/",
|
||||||
|
"https://www.france24.com/fr/vid%C3%A9o/20260426-attentat-%C3%A0-la-bombe-en-colombie-le-bilan-passe-%C3%A0-14-morts-et-38-bless%C3%A9s",
|
||||||
|
"https://www.france24.com/fr/vid%C3%A9o/20260426-trump-%C3%A9vacu%C3%A9-apr%C3%A8s-des-coups-de-feu-lors-d-un-gala-%C3%A0-washington",
|
||||||
|
"https://www.france24.com/fr/vid%C3%A9o/20260426-40-ans-apr%C3%A8s-tchernobyl-les-stigmates-de-la-catastrophe-toujours-vifs",
|
||||||
|
"https://www.france24.com/fr/vid%C3%A9o/20260426-l-ukraine-comm%C3%A9more-le-40e-anniversaire-de-la-catastrophe-de-tchernobyl"
|
||||||
|
],
|
||||||
|
"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/%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://www.hko.gov.hk/",
|
||||||
|
"https://hk.news.yahoo.com/%E9%80%BE9%E8%90%AC%E8%97%8F%E4%BA%BA%E6%8A%95%E7%A5%A8%E9%81%B8%E6%B5%81%E4%BA%A1%E6%94%BF%E5%BA%9C-%E9%81%94%E8%B3%B4%E5%96%87%E5%98%9B%E6%8E%A5%E7%8F%AD%E5%8F%97%E9%97%9C%E6%B3%A8-052003655.html",
|
||||||
|
"https://hk.news.yahoo.com/%E8%A5%BF%E7%81%A3%E6%B2%B3%E5%A4%AA%E5%AE%89%E6%A8%93%E6%A3%9A%E5%B7%A5%E5%8F%BC%E7%85%99%E9%96%8B%E5%B7%A5-%E7%B6%B2%E6%B0%91%EF%BC%9A%E5%BF%AB%E5%95%B2%E7%82%92%E4%BD%A2%E5%95%A6-011342507.html",
|
||||||
|
"https://www.hku.hk/",
|
||||||
|
"https://hk.news.yahoo.com/%E5%AE%8F%E7%A6%8F%E8%8B%91%E5%9F%B7%E6%8B%BE-%E5%AE%8F%E6%98%8C%E9%96%A3%E5%8F%8A%E5%AE%8F%E9%81%93%E9%96%A3%E9%96%8B%E6%94%BE%E4%BA%88%E5%B1%85%E6%B0%91%E4%B8%8A%E6%A8%93-%E6%9C%89%E5%B1%85%E6%B0%91%E6%8C%87%E5%96%AE%E4%BD%8D%E7%87%92%E8%87%B3%E9%9D%A2%E7%9B%AE%E5%85%A8%E9%9D%9E%E4%B8%8D%E6%9C%83%E5%86%8D%E4%B8%8A%E6%A8%93-070832745.html",
|
||||||
|
"https://hk.news.yahoo.com/%E6%84%89%E6%99%AF%E7%81%A3%E4%B8%AD%E5%B9%B4%E6%BC%A2%E5%96%AE%E4%BD%8D%E5%85%A7%E7%8C%9D%E9%80%9D-%E5%AE%B6%E4%BA%BA%E7%99%BC%E7%8F%BE%E6%83%9C%E5%A4%AA%E9%81%B2-095053235.html",
|
||||||
|
"https://hk.news.yahoo.com/%E5%AF%8C%E8%A1%9B%E4%BF%9D%E9%9A%AA%E5%86%A0%E8%BB%8D%E8%B3%BD%E9%A6%AC%E6%97%A5-%E9%81%8A%E5%AE%A2%E6%85%95%E5%90%8D%E8%80%8C%E4%BE%86-%E4%BD%95%E6%B3%B3%E8%96%87%E5%A0%B1%E9%81%93-101524584.html",
|
||||||
|
"https://hk.news.yahoo.com/%E5%A4%A9%E6%B0%B4%E5%9C%8D%E5%85%AC%E5%9C%92%E6%B7%B1%E5%AE%B5%E5%82%B3%E5%A5%B3%E5%AD%90%E5%91%BB%E5%90%9F%E8%81%B2-%E8%A1%97%E5%9D%8A%E8%B3%AA%E5%95%8F%E8%A1%97%E7%AB%A5%E9%BB%9E%E8%A7%A3%E6%92%AD%E9%B9%B9%E7%89%87-151439797.html",
|
||||||
|
"https://www.mtr.com.hk/",
|
||||||
|
"https://hk.news.yahoo.com/%E7%B2%B5%E8%BB%8A%E5%8D%97%E4%B8%8B-%E9%A6%963%E6%9C%88%E6%89%B9%E5%87%BA5000%E5%AE%97%E7%94%B3%E8%AB%8B-%E9%81%8B%E8%BC%B8%E7%BD%B2%E5%BD%A2%E5%AE%B9%E6%97%85%E5%AE%A2%E6%B6%88%E8%B2%BB%E5%8A%9B%E8%BC%83%E9%AB%98-044449103.html",
|
||||||
|
"https://hk.news.yahoo.com/%E4%B9%9D%E9%BE%8D%E5%9F%8E%E5%85%A9%E4%BA%BA%E7%91%A3%E4%BA%8B%E7%88%AD%E5%9F%B7-58%E6%AD%B2%E7%94%B7%E5%90%9136%E6%AD%B2%E7%94%B7%E6%93%B2%E8%8F%9C%E5%88%80%E8%A2%AB%E6%8D%95-022423105.html",
|
||||||
|
"https://yahoo-news.com.hk/BBCChineseNews/41476/?yptr=yahoo",
|
||||||
|
"https://www.gov.hk/",
|
||||||
|
"https://hk.news.yahoo.com/%E5%85%A8%E6%B8%AF%E6%88%B2%E9%99%A2-%E5%90%B8%E9%80%BE20-1%E8%90%AC%E8%A7%80%E7%9C%BE%E5%85%A5%E5%A0%B4-%E4%B8%8A%E5%BA%A7%E7%8E%87%E5%89%B5%E6%AD%B7%E5%B1%86%E6%96%B0-082310032.html",
|
||||||
|
"https://www.police.gov.hk/",
|
||||||
|
"https://hk.news.yahoo.com/%E8%A5%BF%E5%8D%80%E5%A5%B3%E5%AD%90%E5%A2%AE%E6%B5%B7-%E7%94%B7%E5%8F%8B%E4%BA%BA%E8%A2%AB%E6%8F%90%E9%86%92%E6%8B%8B%E6%B0%B4%E6%B3%A1%E6%95%91%E4%BA%BA-%E4%BA%8B%E4%B8%BB%E7%8D%B2%E6%95%91%E5%BE%8C%E4%B8%8D%E5%BF%98%E3%80%8C%E6%89%93%E5%8D%A1%E3%80%8D-014622549.html",
|
||||||
|
"https://www.hktvmall.com/",
|
||||||
|
"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://hk.news.yahoo.com/%E4%BC%8A%E6%9C%97%E5%A4%96%E4%BA%A4%E9%83%A8%E9%95%B7%E6%8A%B5%E5%B7%B4%E5%9F%BA%E6%96%AF%E5%9D%A6-%E4%B8%AD%E6%9D%B1%E6%88%B0%E6%B3%81%E7%99%BC%E5%B1%95-%E6%AC%A1%E7%9C%8B-062002763.html",
|
||||||
|
"https://hk.news.yahoo.com/%E8%AD%A6%E6%96%B9%E6%8B%98%E6%8D%955%E4%BA%BA-%E6%B6%8914%E5%AE%97%E9%9B%BB%E5%96%AE%E8%BB%8A%E5%A4%B1%E7%AB%8A%E6%A1%88-070724139.html",
|
||||||
|
"https://www.hsbc.com.hk/"
|
||||||
|
],
|
||||||
|
"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://news.yahoo.co.jp/pickup/6577756?source=rss",
|
||||||
"https://www.yahoo.co.jp/",
|
"https://www.yahoo.co.jp/",
|
||||||
"https://www.rakuten.co.jp/",
|
"https://www.rakuten.co.jp/",
|
||||||
"https://www.nhk.or.jp/",
|
"https://news.yahoo.co.jp/pickup/6577766?source=rss",
|
||||||
"kakaku.com/",
|
"https://www.amazon.co.jp/",
|
||||||
"https://www.goo.ne.jp/",
|
"https://www.japan.go.jp/",
|
||||||
"https://www.amazon.co.jp/"
|
"https://www.jreast.co.jp/",
|
||||||
|
"https://news.yahoo.co.jp/pickup/6577735?source=rss",
|
||||||
|
"https://news.yahoo.co.jp/pickup/6577759?source=rss",
|
||||||
|
"https://news.yahoo.co.jp/pickup/6577774?source=rss",
|
||||||
|
"https://www.mhlw.go.jp/",
|
||||||
|
"https://news.yahoo.co.jp/pickup/6577770?source=rss",
|
||||||
|
"https://www.u-tokyo.ac.jp/",
|
||||||
|
"https://www.smbc.co.jp/",
|
||||||
|
"https://news.yahoo.co.jp/pickup/6577772?source=rss",
|
||||||
|
"https://news.yahoo.co.jp/pickup/6577768?source=rss"
|
||||||
|
],
|
||||||
|
"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/"
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
36
data/regions/KR/Default/Seoul.json
Normal file
36
data/regions/KR/Default/Seoul.json
Normal file
@@ -0,0 +1,36 @@
|
|||||||
|
{
|
||||||
|
"region_name": "South Korea - Seoul",
|
||||||
|
"google_module": {
|
||||||
|
"base_lat": 37.5665,
|
||||||
|
"base_lon": 126.978,
|
||||||
|
"lang_params": "hl=ko&gl=KR",
|
||||||
|
"valid_url_suffix": "co.kr"
|
||||||
|
},
|
||||||
|
"trust_module": {
|
||||||
|
"white_urls": [
|
||||||
|
"https://www.yonhapnewstv.co.kr/news/MYH20260426181149m1L",
|
||||||
|
"https://www.korea.kr/",
|
||||||
|
"https://www.daum.net/",
|
||||||
|
"https://www.kbstar.com/",
|
||||||
|
"https://www.yonhapnewstv.co.kr/news/AKR202604262230523Mn",
|
||||||
|
"https://www.yonhapnewstv.co.kr/news/MYH20260426193826AbP",
|
||||||
|
"https://www.coupang.com/",
|
||||||
|
"https://www.kakao.com/",
|
||||||
|
"https://www.hometax.go.kr/",
|
||||||
|
"https://www.naver.com/",
|
||||||
|
"https://www.yonhapnewstv.co.kr/news/MYH2026042618093038E",
|
||||||
|
"https://www.yonhapnewstv.co.kr/news/AKR20260426212211hsY",
|
||||||
|
"https://www.snu.ac.kr/"
|
||||||
|
],
|
||||||
|
"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.daum.net/",
|
||||||
|
"https://www.coupang.com/",
|
||||||
|
"https://www.kakao.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://news.google.com/rss/articles/CBMinAFBVV95cUxNSVlMSTFMdE12ZDRwRlc0M3EzMFlFaXZTLVc4VmplMXZ4NVlPamF6UG5HLTVvZ1pHci0yaDBoeklDSkJfbzlPcW5HazBOVEQ0bThZZEM2cHlLbENaSTFtMC1OY0dwdE9fd2hQMkVUOC05bF9YSFFrZGJsZTRyNFZqWExXMkpocEo1WGdqWFZvcVdTdHF6VnhlUUZCMm8?oc=5",
|
||||||
|
"https://news.google.com/rss/articles/CBMioAFBVV95cUxQVTRYOVg0MGRWSFZxdUsycUE4ejR1S2J0bFNhb2wtaUJSc3hyWEYyNkJpTDlkYTRnVWphMlVINTBLSTZnOF90ZHVPbDZpdVVqSng0SDJQcmdzcTFkWTlJdGFpZFVibkIwN2ZMX2tHem1TekJCWEFWcUtNSndUSHRmYjlRLTVkMnZjcFFNaDZGbnlUbGpaNElINWU2bjZ2czI1?oc=5",
|
||||||
|
"https://news.google.com/rss/articles/CBMizwFBVV95cUxQUE83SE5kX1ZaT2dlTUNBYXRZM3ZOUlRZWnJvc3VHbGJ5Y0owM1ExLUsyWVVMZVNEb195U0FTZ2VLRzl2OU13S05qVVRacGFabTgxdER1NUdJZkhxS2ZLY1VFdjdjUVZJVW9acjVnTUpVbmxsMW9ERExMQ0cxdzQtNjMxVkphVVhKckdfYVJXTU1YVHU5WDhubVU4aW90c2tiOGk4RkNndnV1T2JvdW9UdWRoaGxpVlZoeUVkekJsTXhxR0hqeWlPVTk5VGo1VTA?oc=5",
|
||||||
|
"https://www.lazada.com.my/",
|
||||||
|
"https://news.google.com/rss/articles/CBMi8AFBVV95cUxPSWhtYU9rYVNBWXhKNXhhWGNEQUIyQUhQd2ZkbUpRS3N5S3FyMk9xRWU1c3ZDY1NSLVVONHNNbm1jVV9kX1M2Nl9ZYnMxci1mclBwZF9LTUhNY1BpT3JZM2ZyczNxRzJIcG56R3dzaU9ydGUwS0xWWm5WQ3JfZG9RMlZwc3FNY08wa3NOZ0pqb2k0NFR1UzVDVlpkRVExN3RmNFVCc3Y5dnNrYm83VTFlU2c3WS1YWGhFM3JnbGxwY3MzaEt3cVlvYUgxMHVKaTRMQm1aZnNUV2xXUG5XeHJFOVI1VmxaUmh0a1ZfT2NQWTXSAfYBQVVfeXFMTzRLeFNJMlZiNVJnQUI2MWFFakdpQUstUE52SFFoN3lCS3VacUZLdGVYWVhaWC03NkpydmEtek1XNEltLTVqUkRHS1k3emNvRzk4WWRlSE9RTmQzQXhIdml5a3VBd25uel94S0VxNncwb01XOHluRWZfMjIxRkEzSnh3dUxraEtTM2JxdmZkdjN4cUVZeHVKcy15RV9MS01hcDc3dHRjdVRFbjZ2TndOOWRjY0RFbzRnWUdqU1BSRF9IYjdrUHdHU2ZScll1UzQ3Zkcya3hFaGkyT3R5bm1iR1hwVG4ta2FsTnRrS3RuM2F5NmhCakRR?oc=5",
|
||||||
|
"https://um.edu.my/",
|
||||||
|
"https://www.cimbclicks.com.my/",
|
||||||
|
"https://news.google.com/rss/articles/CBMipwFBVV95cUxQWEdOcUszYjJRSm5SbVlHN1AwZFlxX3hZTmxqYWdqSGJKcnNmZ19hcFBERnFWdEhoa2RtUXJvRTVMakp5TFB2WGItLXJic3Z0aW1FVDRSeW1tejhMcjUwN0dSdERUQU9ibUpYdWVGZkdCUTc0NmtMNTdxbktFWUNESVY1ZG9nTUtCWWVqWmEwMkpkdDQwTExITVpka0Q3Xzc4bEJMWjAtVdIBrAFBVV95cUxPN2pKQUtOLTJxUWtUZ2ZUYUotQnVWTngyV01zSG8wa1VtUWhQVXJGT0xqSWgya0Uxay1CU0NQYXE2Vm56SUhGbDhhX05zd3dZUURwYzRkaFNobmFCTFo0ZEhobVhzWmxDeDRLSFV1b0tXdTA0VVNSTWNmOVVhSDRySXJ6dHhSUHdRX1AzVm8tQ01VaHViZTU2bnowTHhCbkNpbmtzU1l3UmtDbmtV?oc=5",
|
||||||
|
"https://news.google.com/rss/articles/CBMi1gFBVV95cUxOdEswcWtlOEx6RUwyYzlYOWpKblFOaUxndmNvUHNMMHNfOENteUVnZ2x3Y1BSZTFsaU1rQ2E4WFVWcnZtVkxLUV8wVHJGTmEwZmI5NElKZmRHLXdYaTM0WFA3TkxCekhyVE1TN3d5VGdsZTdWSmQ3S3VLN0xHbmdfdjhfczdyUlI4M0JDTWd4enJVbXpoUkgtaWR5YjBnWF9DUHlrdTY0d2YwLTNNZGhwb2d3SjNyNEJmU05RYl91bWRzb3AyOU5BaHEzTmNWNjN2Z0RFSGR3?oc=5",
|
||||||
|
"https://shopee.com.my/",
|
||||||
|
"https://news.google.com/rss/articles/CBMigwJBVV95cUxPaDE2LVNSX3ZfYXBoYWdodTRfeURTUXp3bWlLazE1WWdwLUpKZWhpM2lxVmJkSjVOaFVUMWxZZW81bnVTS19ybE9SdXlodHF3SE1SSkdzZnh6TE1Zb2YybEIxMEIxeF9JWktvQndaakY2UkVjX1JYaHNNNEdzNmJyYW1UVG4tWERsV1pHUVhzNGNCR0pSZzd0bHFaSnhFQ1dYbGlVR2EzRlBrb0xpNGlCQVpXaVJOaU1Jd0YyenR6bE8yRlU1bjJFeXU2eEVqR3g0UEFEcGFkcFNNTmlNWmJCWVk1bGEzMkhsWHNUZGQ5cWVkWU1QQzREWXVmTWFFa01USmg00gGIAkFVX3lxTE5LWlNTNlpNdHNVZ0xraXRUc1V5d3BxdUxTcUwwWGswVkdsb2tBcG9nbW85Q1BzWkdNT21zX1FEb0ZDMzdmWmhReW5ZcFkxbmJjaUFsUlNhSW5pSE1DdnNNQ2xYS0ptSUdNdnQ5Z1Z4QkJlcmZyNUpwNkdydVNVLW1FUndoc3doWFdGb0FmOTNrSjJHelhMaXFodjh2RG9BMktMQnZSZ2FCeFA2SFFzbm94dXhsSGJZb3JmUGN6ZFdyM3hqamUxQ0RjUmJTOXZmS1BfZThDZ2hEMEh0R0RUbVl2ekUtQlZ6VHRCb2lSdTgtNlJhalIwTjF4MkJxVmJfRWp1VVhzNUg1Mg?oc=5",
|
||||||
|
"https://news.google.com/rss/articles/CBMiggJBVV95cUxPdDl4MHdqOHJqUDJ5dDB1LVhTeGhMV004TUNQaVFWSGlZNEU1N1RXRU45bG5TWFR0STlYTnNYNWh6Q0xBX1dYQ2NOcHYzWHRHbm9SeWUtSjBCa3hwN1lSZ3dQSmNkMlJlanpYZG5VNVRkVW94MTBZUXlpeHRabjBJdHJTMW9mYzBldDluNG40VWNrZ1V3dU1wa1NwOTVvcEZXeV9ZUS05bWwyaE96T2I1TkFMZ0YyamwzYzJva0pKWlpNYWs1X1Awa2ZGdmtFcmJZTUVPU08ycmtPRDRDR0ZiWXFRWmgzbHZEOWs5LVZOUmd0Smp3MDlCQWhHNXNIWU5CR3c?oc=5",
|
||||||
|
"https://news.google.com/rss/articles/CBMirgFBVV95cUxON0E3MDJvQ1lURlZjT0kxZTNqVklNaERWLUQ4TGJ5MkVKUDFqOFF0cGxzM0V3MXRBQ1RGa1lUb09DV2IxUGZnN281QjJUdjM3aDc2SFVhd0IzQjYta183TjZ0U0psaEV3bjlGQ0Y2Q05NRzlTa1dmVDRoOUtuakxyS2xHbDlublhHWFhjVERqd0d4a0YtMDJKRTB1bC05dTYyeWR5WkFJQjM3RTVITFE?oc=5",
|
||||||
|
"https://www.maybank2u.com.my/",
|
||||||
|
"https://news.google.com/rss/articles/CBMiqAFBVV95cUxPcDZHV1RSLXFyWC1HVFdQd05wU2wyWmhMcmc5VVdfWDNDQXpCV0RvcVF0X0hPU20zMjgta1ROV3N4cHRNMU1IdlFhTkhuVjBCZ1dSVTBHYkhZb3BZTy1qSWszdTlfbkxnSkVnVGtSdGRoc2ttaERkTEpXTm9OUUFLdF85SVJJaGVPeDFZQWNzd2JEanVldG9Fal9neTFtb04tR2YwXzdrRks?oc=5",
|
||||||
|
"https://www.pos.com.my/",
|
||||||
|
"https://www.hasil.gov.my/",
|
||||||
|
"https://news.google.com/rss/articles/CBMiwgFBVV95cUxPQVY3QnVtZ1lMOHFESi1qdnRMZ3JhRG9VYm0yVl9JV0Q3UTc4X3I1bU5JZ3I3TGNfSFQxLVNEVUNINUNuS1dka1JSNHZ5SEF1X1NBT2h6SnhSenZCQzdpQU5WN0RWT0NBTHN0R3ZJYm1hZXp6d3lUWnlKZFVBSF9ybjdPdzN3dm9fSERNUFFOMjFGN3dxdEctMEZfZ3dSc0dueThGMkwtaVVXQm1mb1NXbzlJbUV6MXhOVEhidERKemIwZw?oc=5",
|
||||||
|
"https://www.malaysia.gov.my/",
|
||||||
|
"https://www.kwsp.gov.my/",
|
||||||
|
"https://news.google.com/rss/articles/CBMi2wFBVV95cUxPbXNldGZ1cEFQb3dyN2VTT0xpZTJvMHAxVWZIZENMRzNtckFGLWhCTGhoU3I1dXdLMXJmZXRsaXNqVXJmYTBaMlRNMXNlNVlJMHpIaVk3em44aGJjTHp4Y2lXemlMVzVaeWItbC1BNk84VThJTDdKMEp5YlpydjlNTTU4Tm9ITmxLTjY0N012Y0kzZlRMVWR2MDBBLVBNa3JDZjg2MlVzZlhLaEIydlVkS3FqZFkyckhIQnI3SjJneDFlTkVuRGV0WTViczRHdkxQemN0dmJDX19DN1HSAeABQVVfeXFMUHJKNnR1VWdPRHJoZ3d6WExBWFRiYXBnTnp4b08ycGxQZDdwRnlRTi0tODJocEltUzdyV2pMd3pkWHlnOU1SNFA3VzlBdndtbHFGVHVjbllQTE56bDMwTVhJVUUxSzJBbW1lZ21ETlA1UXFrNnN2RGRxTFl4VHdPMU14VExmLW1KbFRZZnNvUDJKNk9VVDlqU0pnQ05sN2hHNUJCSGRUM2cwTUhlWUt0emdpenhxcm1rVnE0ZEpNZlcyVE5NNU1ROG1YcENuY2tlME5pSlNtYkdScThBalJITXI?oc=5",
|
||||||
|
"https://news.google.com/rss/articles/CBMi0AFBVV95cUxPUWljaGo1dnJqT2J5d1pkdFZ6anQtMm03NFlVMU9raVlwR1VhNzlJTGNYZ295Wl9hbWJaVTRWRXNDTmVNZVdWdE05QnVrSDl3eTFuZU43ZTllUlZQLWpTLTFYYm5nRXBCcXF4ZnJucTh1UzVkNW1vcElxYlNXMHB2MEJUcW1HUktCb01pbTZIQUdiNHpjYUhkcW5NcUZocjRGTkV5VzVrd1RzMHJZWE9yRlJHR0docWtGRUNUYUVDWXE1NE81X2RwNElFcVVLM2x5?oc=5",
|
||||||
|
"https://www.thestar.com.my/",
|
||||||
|
"https://news.google.com/rss/articles/CBMi3gFBVV95cUxQV3Q1Z29sWGlydWJnRS1VQ19KaWNYVU5DcEtZNnhsYl9YNzRodkNjNjQ0RnVnM2Mxcno0ZUZNYnduRnE0ZnB0YkdBZWZVaTk4YTZfMjBRMWVtMVdNN25DX19mNmNfZVVfT3pHSERYSlI5Y2c2QlZDTDNnV3A3c25qTEIwVnZFeXl0ZHpkMzE1Si14ZTJMb1VDZGhRTWJjOXhLeHQ3UGxpQXZsUW5tMEJzOWZJOHNfaEt2Zm5SbXV2aFJCYjZiTWM1Zzl1NmpaRWtzYTdNaGdPZS0tekRBSmfSAeMBQVVfeXFMTm5UakdveUlXbmZaRkl2M2JqdG00US1tVGVlWmpSMlZvc1UzbnFIazFkSHB3cXhNM2oyaFZuemFPR0dmc1daSEo2Y3JLdnVmS3R3U0xfVE5QcEJBbURVVnNiRWlhaFg5eHk3NUdMeVpySkJMaGp3VDFJZEZ6RzhZYkZOeElVWjhFaHpwLUVlcDNNd1Z2T1ZWMFVOTFVuZTZKYzdWSUJydDJ5Vm45aFJlSFFVeE1kaENxelJQZm1yN2JaUUVQYzZXU3dUT3AtRnhSVXpUVFZoclJWZFNqMmhMVnJRQTQ?oc=5",
|
||||||
|
"https://news.google.com/rss/articles/CBMirAFBVV95cUxOQzRpYXJLQVU5TDlXR2JPQkEtS0xpTTJlUHFWRjNRSUVYckJzZ0xkSDcwbXVlV05TWFFubEpCNENrX2t4WDZ1YUxZOUJ6RmRBcXFzU25DY1FFZkttRHZmcC04YUMtNkJ5Q0F2Q2FIMVQxbTdpYl80d0QyUTBhb3Zhd21Hb3dZYlJUcGZkR0o1THVwN3MzcVBIeDVvRkNqZU5FdTRZSTNDdXV2aUdC?oc=5"
|
||||||
|
],
|
||||||
|
"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://nos.nl/l/2612033",
|
||||||
"https://www.rijksoverheid.nl/",
|
"https://nos.nl/l/2612111",
|
||||||
"https://www.nos.nl/",
|
|
||||||
"https://www.bol.com/",
|
"https://www.bol.com/",
|
||||||
"https://www.nu.nl/",
|
"https://nos.nl/l/2612059",
|
||||||
|
"https://nos.nl/l/2612026",
|
||||||
"https://www.buienradar.nl/",
|
"https://www.buienradar.nl/",
|
||||||
"https://www.telegraaf.nl/"
|
"https://www.marktplaats.nl/",
|
||||||
|
"https://nos.nl/l/2612057",
|
||||||
|
"https://nos.nl/l/2612081",
|
||||||
|
"https://nos.nl/l/2612096",
|
||||||
|
"https://nos.nl/l/2612110",
|
||||||
|
"https://nos.nl/l/2612075",
|
||||||
|
"https://nos.nl/l/2612020",
|
||||||
|
"https://nos.nl/l/2612013",
|
||||||
|
"https://www.rijksoverheid.nl/",
|
||||||
|
"https://nos.nl/l/2612078",
|
||||||
|
"https://nos.nl/l/2612012",
|
||||||
|
"https://nos.nl/l/2612088",
|
||||||
|
"https://www.ing.nl/",
|
||||||
|
"https://www.ns.nl/",
|
||||||
|
"https://www.belastingdienst.nl/",
|
||||||
|
"https://nos.nl/l/2612044"
|
||||||
|
],
|
||||||
|
"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/world/trump-says-iran-can-call-if-it-wants-talk-iranian-envoy-returns-pakistan-6082246",
|
||||||
"https://www.channelnewsasia.com/",
|
"https://www.channelnewsasia.com/sport/chelsea-thrash-everton-4-1-consolidate-second-place-6082091",
|
||||||
|
"https://www.shopee.sg/",
|
||||||
|
"https://www.channelnewsasia.com/sport/fifa-set-increase-2026-world-cup-prize-money-6082241",
|
||||||
|
"https://www.iras.gov.sg/",
|
||||||
|
"https://www.channelnewsasia.com/world/iran-us-war-peace-talks-abbas-araghchi-pakistan-6082161",
|
||||||
|
"https://www.channelnewsasia.com/world/netanyahus-biggest-rivals-join-forces-israels-next-election-6082166",
|
||||||
|
"https://www.channelnewsasia.com/sport/arsenal-beat-lyonnes-2-1-in-womens-champions-league-semi-final-first-leg-6082276",
|
||||||
|
"https://www.channelnewsasia.com/sport/chelsea-reach-fa-cup-final-1-0-win-over-leeds-6082231",
|
||||||
|
"https://www.channelnewsasia.com/world/us-white-house-correspondents-dinner-shooting-trump-likely-target-6082056",
|
||||||
|
"https://www.channelnewsasia.com/world/israel-lebanon-ceasefire-hezbollah-benjamin-netanyahu-6082041",
|
||||||
|
"https://www.dbs.com.sg/",
|
||||||
|
"https://www.channelnewsasia.com/sport/alex-marquez-wins-spanish-grand-prix-again-brother-marc-crashes-out-6082061",
|
||||||
"https://www.gov.sg/",
|
"https://www.gov.sg/",
|
||||||
"https://shopee.sg/",
|
|
||||||
"https://en.wikipedia.org/wiki/Special:Random",
|
|
||||||
"https://www.fairprice.com.sg/",
|
"https://www.fairprice.com.sg/",
|
||||||
"https://www.dbs.com.sg/"
|
"https://www.channelnewsasia.com/sport/rallying-ogier-prevails-after-solberg-crash-win-canary-islands-rally-6082001",
|
||||||
|
"https://www.cpf.gov.sg/",
|
||||||
|
"https://www.channelnewsasia.com/sport/pogacar-outlasts-debutant-seixas-claim-third-straight-liege-title-6082141",
|
||||||
|
"https://www.channelnewsasia.com/sport/champions-in-waiting-inter-held-2-2-draw-torino-fight-back-6082341",
|
||||||
|
"https://www.singpass.gov.sg/",
|
||||||
|
"https://www.channelnewsasia.com/world/belfast-northern-ireland-car-bomb-police-station-6081991",
|
||||||
|
"https://www.nus.edu.sg/",
|
||||||
|
"https://www.channelnewsasia.com/world/gunman-sought-kill-trump-cabinet-gala-dinner-6082331"
|
||||||
|
],
|
||||||
|
"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://www.ntu.edu.tw/",
|
||||||
"https://tw.yahoo.com/",
|
"https://www.dcard.tw/",
|
||||||
"https://www.pchome.com.tw/",
|
"https://news.google.com/rss/articles/CBMiTkFVX3lxTE8wVHNwUFFmWDdlaktVRk5PdENTWjdLU1h0ZmkyQzVzeXBvaDkwbVdTUXJUZy1pWmtlSjM0a3FJRE1vMzVYVmpWb1NYSS1DZw?oc=5",
|
||||||
|
"https://news.google.com/rss/articles/CBMiYEFVX3lxTE5WeTZ1a2R0U05XRjJJWjVQcGUzMzRmRm5wYmlfOFJuUTFncFlSRER5YzEwLUtVRFUtQ1pPQndWY0hmNU5wVGEzbEx2VkVSLVNFWkM3ZjZ6am9FY2RseElXUtIBZkFVX3lxTFBrRjRhRmtKOW5yVDEwN3d1bDRlR1lRWlVtQWt3MlB4QkVhaTAyR3VVQW9neEVrLVczQV92cE5MRnBmQnFDWU1tU0VxOEt3UDBYR01SMkYwal84QjRHOWFISEpBVVdUdw?oc=5",
|
||||||
"https://www.momoshop.com.tw/",
|
"https://www.momoshop.com.tw/",
|
||||||
"https://www.ruten.com.tw/",
|
"https://news.google.com/rss/articles/CBMiXEFVX3lxTFBXUkQwN1hUWFhJODE0WndZUks1VVJyUTF0NXVTTGlDcWdCa0RaYUk4V3ZCbzNTRnRPVGFkUG5YLVdmLTVFeGlpMWRINlN2RTFvSXVsUkZWLUxGS29y0gFiQVVfeXFMTTlqNFRzeF9zRXZ3UzZwYmVJM0RnWXJyVlNzX3dsZnMtbzZDWUFsZE1wMEllWGtFVUpUbDBLbFlYamlYc1pUVU5aUjNyOWdWWGIyandDNUVOTEViNHlxX0NDZ0E?oc=5",
|
||||||
"https://www.mobile01.com/",
|
"https://news.google.com/rss/articles/CBMiUEFVX3lxTE0tRmg3SGI5dy1PU1FaSF9LVmNuaUNIam11ekFyR2g4cWEtYnJmWGxTelpTQnh0eko5dHNOdnQxY19FbUh4WGZLNnh3UmMzVU5N0gFWQVVfeXFMTzNRandOdzR3NGFva0E5Y24tbVI1OVJpajh0TlpDSlJZM3BxOC1mQkM0cG1sUnYwaHNWMWJyNHVaTlRLLVpLWExhelVTRzVaNE45QjlSV0E?oc=5",
|
||||||
|
"https://news.google.com/rss/articles/CBMiX0FVX3lxTE54TWp5bWpSZHZNTnF6LVc4VEh4NXVIMklZbHlvQ1JhRHNsT2FqZ1pBaUJFQi1CVjA4X0Ftd3BnbWw4dWZ4T2Fybl80cFFITUFxSXhaR0dSYnpvdE8xX3Jz0gFkQVVfeXFMTjdabUNHRW4zU0R6RFc1MWNoMU4ydWtZMF9VM1BNSFlHVnBhdGJDc0hIbFQ1WmV3ajZDZHc5N19xeW1CQTVvaUdQNUN2NUVsdEJMazJTaWl6a3ZKTy1hQUUtTl9LNQ?oc=5",
|
||||||
|
"https://news.google.com/rss/articles/CBMiU0FVX3lxTFBRQk1FUUJRQTlPamd0SHdjay1NbzF1c25fRnF6a0x6Vzc0RUw5WHVadXpmRlozYzRxb0dyc0g5QXJsRG80WGtMd2dFUk8zcU1NS1VR?oc=5",
|
||||||
|
"https://news.google.com/rss/articles/CBMiUEFVX3lxTE1tTkNNaUpWTVhNd29sQVVoRkhnd0V6aUpBYUtxdUxkcEhwbEt3UG94ZkhfOFRoOXhLSjh6eTVEam9fUi1FclNkYkZKZ3ZoSllC0gFWQVVfeXFMUFR1S0xkSEFyNlZrbURkX0FGdWhQY3pMTkJhZk1QdGh5bTZSSElJYjVERDA4LTh4cklTaXZLS1VzbTJ5OTFxMzFxVTN6WlBCa1BJM3dKRGc?oc=5",
|
||||||
|
"https://news.google.com/rss/articles/CBMi6wJBVV95cUxOdUFOaG5CRU0yMXBNUzVxaWFaWGVJQnA0dHVpOFBtYW1OMjFIcW53WVVqUjZjWldjcFY3VWFJX2N0cGdKOTVyQVN0bW9OUHVmMDJLODJXUndyaGx1MU84Zi1DTG9YbWFWQTZQbWFYN3cyNzJvZUdEWW4yTFNkRzgxWXB1REdBLThkOVpRNHVTYzB3YnE2TzAtYkU2T3ZuSV8xSkNtZ0ZnMnAtNXJ2anFTaTl2d3VhU3dBbkNTd29jX280R21OWEVVNU5MM2dnbXJrUVRkUWdROElDaDdDd2J2ZVZaaVJ5VW9JbVhTc0dydjRQYUlKdW9ZV3U4NWZTbms2b3JpU19oOW93SUNtcWU1OF9hMUJqWVl5UEtXcjlxMUFVX1dOUVFyUkVpRzJZaG9wclg3ek5FQkRYaGg2cGF1OW9veGdzVWNTaHFmQld1Vnd5SlMtQzNCeW1BRmsxMWpEQzctQjltYThtbDg?oc=5",
|
||||||
|
"https://www.gov.tw/",
|
||||||
|
"https://news.google.com/rss/articles/CBMi4wJBVV95cUxQZEg0dHh4aWxPMzg0MW5mQVRoSjY1dnAybW15V1BYczJIZy1wUmVsMDhFQ1RYNjZzb2hkQXZmXzBDUmV5WFcxdVdNV2RpWlUyWmV4UzJLeEkzcU1ldFpibnhJS3VRY1JQQzgtWTJvUnpJc202ay1DTW9lRVpmbDJyTk9NMnJZVzcwLTdDQTg1Nlc0QjBlNFRSYXJrM1VVM0phQ0dGVnVfekZwS3k3XzhRTTVzeEtMa0xGUm5DTl9JT1M5MHNyUzNxbWJBSmlWeU5fR1JlTVlmeGxKN0pyS2RmN1pQUzVKaHFBUE1wLVp6ZUxrcmhIWmhvbHlDX1I4Njl2YWpFOExmal8zbVR4UVE1M05tbzk0TWFFMDJXRl85NXJWUXd5bmJ1RDltcVdBaDk4WVgycDFSZFNDV1UzbVpKZkxLaUJxLW1JZmFFeEoyd25mem45RmQ5Ykx6M0JsdVNma3Zv?oc=5",
|
||||||
|
"https://www.pchome.com.tw/",
|
||||||
|
"https://news.google.com/rss/articles/CBMilAFBVV95cUxPa3M2RzNHNmZ2S2ljdmg5MG9PdzFxZlFSSzYzNUZVOWZKaFRrZGhfZTVpOFJnVFg5LUZad1pfUmJuc1JvZEFkRUlaWWJYX0p3N3g1QkxnMFNBTDJ2R2NKb0tuVW1rOUQ1bmREUnlTRS1TY0hPdHozSzBnWEhqeHlZRVkzd2FKbU56TVlFVktjUkk3ZTJL?oc=5",
|
||||||
|
"https://news.google.com/rss/articles/CBMiX0FVX3lxTFBBUTY4Z0tlMm50VEZjNGZCdm93anpnVlNkU1hNM2FQTzR5cl93bklKZ19pUF85ckF3WUp6VlVlcXM1dFJROVFlZ0lqYi1yVFFndGU2RC15cHdDWG9qM013?oc=5",
|
||||||
|
"https://www.post.gov.tw/",
|
||||||
|
"https://news.google.com/rss/articles/CBMiXEFVX3lxTE95aEV3NE5NYUgtcjNTWEU5ZmNEOEl5SHlPVkdoTVBtWGpZNVFXZ2V6LXp3SktWckZPN0VfN3hnMURIejU1WGdma0NaXzIyRlNXM0dTbmIwMVZzM1Y4?oc=5",
|
||||||
|
"https://www.thsrc.com.tw/",
|
||||||
|
"https://www.cathaybk.com.tw/",
|
||||||
|
"https://news.google.com/rss/articles/CBMiU0FVX3lxTE5NSExmd0hnTzloYUpicVpVcWRIUlZsa2ZvclhYNVI5b3g1dlFkUlBiNFFGM1htTjhiS3Rnc2hlWWs0V3A1anl3OVJuamw2U1JfQkpz0gFYQVVfeXFMUFpEUGkzQTlDblZVNUhkUVdMV2lKVExqdS1qTHNQanJSSVo2d3FkSl9PRGU3elJoamhKUjdhMmpYVUhJdUQ2Q1F6UjJkV3BwQ0ZSem14QTFTeQ?oc=5",
|
||||||
|
"https://news.google.com/rss/articles/CBMisgNBVV95cUxNZXR5dXMwOFBKVjNHaEtKMUhfTngtZUlaY1hQQkwxSUl2bEdmVU1aOHFxZHRORHZoVXkzQ0htRGdJdTBrYkprY09SNk1SbXgwalI3RmdZb29WWTlHTkdOMVRja19TbFZudFlUV2JNSGN5eW5KaTZPYmp0YmFIS3BuYm5DMTBqMjBHVkwtUVBtOU94QlJaZXFINkxfQzVhUkg0YzdCU21qcVFTT1NkQXQ5YjFhNlhWT2tBZXVSbmpZR09QR2tOWGlDYTBSbkszYWF4VDFTRWNGYjA5MzFDRFphd3huSjh1LU02YnVZQURrX3RpRzdBLWJ0a243NjM1SHpRREk5RENHN3FGUS13WEZ3cFJaRUVKTHpDNHRMNmZCaVhQVHRrNmtCdmhiVG5LMkJNSjRlY0dYS2QzNnpLb2g4RXk0TzRMQmljeTZVT2kycFpDTHpVT0FoLXJhVkdlX3NTNzU0V0ZVUk8xSTUyRW9qSUYwVDdVUjJCZ2RyTXRxZXBjZThHRnRhQ3hxUWtpSEZUQ1Z6RVg0UE95dmlpc3FOLUY1ZkxFSmhRRkpCY0pFV0FNdw?oc=5",
|
||||||
|
"https://tw.yahoo.com/",
|
||||||
|
"https://news.google.com/rss/articles/CBMiYEFVX3lxTE1qdTlNV01HMTVLZEZfbFBfQloyX3Y4TkN6SnA0d0RPWDhtc3BEQVJkMWJtUHV1TmZaRjZqNDlKSU5CVFpMcnNuOW5pSXI5aTVrNldHZ19XbUFEMVhCVU9FMQ?oc=5"
|
||||||
|
],
|
||||||
|
"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.com/news/articles/c705228kpx9o?at_medium=RSS&at_campaign=rss",
|
||||||
"https://www.bbc.co.uk/",
|
"https://www.gov.uk/",
|
||||||
|
"https://www.bbc.com/news/articles/c62j23wzeqeo?at_medium=RSS&at_campaign=rss",
|
||||||
|
"https://www.ox.ac.uk/",
|
||||||
|
"https://www.bbc.com/news/articles/cq6jn8z84y2o?at_medium=RSS&at_campaign=rss",
|
||||||
|
"https://www.bbc.co.uk/sounds/play/p0ng84b4?at_medium=RSS&at_campaign=rss",
|
||||||
"https://www.amazon.co.uk/",
|
"https://www.amazon.co.uk/",
|
||||||
"https://www.theguardian.com/uk"
|
"https://www.nhs.uk/",
|
||||||
|
"https://www.bbc.com/news/articles/cz0e0rn179eo?at_medium=RSS&at_campaign=rss",
|
||||||
|
"https://www.bbc.com/news/articles/c2484nln8zeo?at_medium=RSS&at_campaign=rss",
|
||||||
|
"https://www.postoffice.co.uk/",
|
||||||
|
"https://www.bbc.com/sport/football/articles/cededgwjj62o?at_medium=RSS&at_campaign=rss",
|
||||||
|
"https://www.bbc.com/news/articles/cz67vwd63wwo?at_medium=RSS&at_campaign=rss",
|
||||||
|
"https://www.bbc.co.uk/news/10628994?at_medium=RSS&at_campaign=rss",
|
||||||
|
"https://www.bbc.com/news/articles/cq59v23vy0xo?at_medium=RSS&at_campaign=rss",
|
||||||
|
"https://www.ebay.co.uk/",
|
||||||
|
"https://www.bbc.com/news/articles/cgk0ky5zgvlo?at_medium=RSS&at_campaign=rss",
|
||||||
|
"https://www.bbc.com/sport/football/articles/cnv8v10r1z7o?at_medium=RSS&at_campaign=rss",
|
||||||
|
"https://www.nationalrail.co.uk/",
|
||||||
|
"https://www.bbc.com/sport/football/videos/cm25202rn55o?at_medium=RSS&at_campaign=rss",
|
||||||
|
"https://www.bbc.com/news/videos/cgqkq18qqeeo?at_medium=RSS&at_campaign=rss",
|
||||||
|
"https://www.bbc.com/news/articles/cr717nglye0o?at_medium=RSS&at_campaign=rss",
|
||||||
|
"https://www.barclays.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/"
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -8,13 +8,39 @@
|
|||||||
},
|
},
|
||||||
"trust_module": {
|
"trust_module": {
|
||||||
"white_urls": [
|
"white_urls": [
|
||||||
"https://www.bbc.co.uk/",
|
"https://www.bbc.com/news/articles/cq59v23vy0xo?at_medium=RSS&at_campaign=rss",
|
||||||
|
"https://www.barclays.co.uk/",
|
||||||
|
"https://www.ebay.co.uk/",
|
||||||
|
"https://www.postoffice.co.uk/",
|
||||||
|
"https://www.bbc.com/news/articles/cgk0ky5zgvlo?at_medium=RSS&at_campaign=rss",
|
||||||
"https://www.gov.uk/",
|
"https://www.gov.uk/",
|
||||||
"https://www.amazon.co.uk/",
|
|
||||||
"https://www.theguardian.com/uk",
|
|
||||||
"https://www.nhs.uk/",
|
"https://www.nhs.uk/",
|
||||||
"https://en.wikipedia.org/wiki/Special:Random",
|
"https://www.bbc.com/news/articles/cz0e0rn179eo?at_medium=RSS&at_campaign=rss",
|
||||||
|
"https://www.bbc.com/sport/football/articles/cnv8v10r1z7o?at_medium=RSS&at_campaign=rss",
|
||||||
|
"https://www.bbc.com/sport/football/videos/cm25202rn55o?at_medium=RSS&at_campaign=rss",
|
||||||
|
"https://www.bbc.com/news/articles/c705228kpx9o?at_medium=RSS&at_campaign=rss",
|
||||||
|
"https://www.bbc.com/news/articles/cz67vwd63wwo?at_medium=RSS&at_campaign=rss",
|
||||||
|
"https://www.bbc.com/news/articles/c62j23wzeqeo?at_medium=RSS&at_campaign=rss",
|
||||||
|
"https://www.bbc.com/sport/football/articles/cededgwjj62o?at_medium=RSS&at_campaign=rss",
|
||||||
|
"https://www.amazon.co.uk/",
|
||||||
|
"https://www.nationalrail.co.uk/",
|
||||||
|
"https://www.bbc.com/news/articles/cr717nglye0o?at_medium=RSS&at_campaign=rss",
|
||||||
|
"https://www.ox.ac.uk/",
|
||||||
|
"https://www.bbc.co.uk/sounds/play/p0ng84b4?at_medium=RSS&at_campaign=rss",
|
||||||
|
"https://www.bbc.com/news/videos/cgqkq18qqeeo?at_medium=RSS&at_campaign=rss",
|
||||||
|
"https://www.bbc.co.uk/news/10628994?at_medium=RSS&at_campaign=rss",
|
||||||
|
"https://www.bbc.com/news/articles/c2484nln8zeo?at_medium=RSS&at_campaign=rss",
|
||||||
|
"https://www.bbc.com/news/articles/cq6jn8z84y2o?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/"
|
"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.walmart.com/",
|
||||||
"https://www.yahoo.com/",
|
"https://www.cnn.com/2023/04/18/media/netflix-dvd-red-envelopes/index.html",
|
||||||
"https://www.target.com/",
|
"https://www.cnn.com/cnn-underscored/reviews/mmmat-silicone-mats?iid=CNNUnderscoredHPcontainer",
|
||||||
"https://www.npr.org/",
|
"https://www.cnn.com/2023/04/17/media/dominion-fox-news-allegations/index.html",
|
||||||
"https://www.weather.com/",
|
"https://www.harvard.edu/",
|
||||||
|
"https://www.cnn.com/cnn-underscored/deals/dyson-supersonic-sale-2023-04-17?iid=CNNUnderscoredHPcontainer?iid=CNNUnderscoredHPcontainer",
|
||||||
|
"https://www.cnn.com/2023/04/18/us/mccurtain-county-oklahoma-officials-recording/index.html",
|
||||||
|
"https://www.cnn.com/2023/04/17/economy/china-gdp-q1-2023-intl-hnk/index.html",
|
||||||
|
"https://www.npr.org/2026/04/26/nx-s1-5800054/iran-talks-on-hold-shooting-talks-pakistan",
|
||||||
|
"https://www.bankofamerica.com/",
|
||||||
|
"https://www.usps.com/",
|
||||||
|
"https://www.cnn.com/2023/04/16/entertainment/jeremy-renner-update/index.html",
|
||||||
|
"https://www.irs.gov/",
|
||||||
|
"https://www.cnn.com/travel/article/high-speed-rail-us/index.html",
|
||||||
|
"https://www.npr.org/sections/the-picture-show/2026/04/26/g-s1-118806/photos-the-aftermath-of-the-white-house-correspondents-dinner-shooting",
|
||||||
|
"https://www.usa.gov/",
|
||||||
|
"https://www.cnn.com/2023/04/18/politics/clarence-thomas-ethics-democrats/index.html",
|
||||||
|
"https://www.cnn.com/videos/us/2023/04/18/jeremy-renner-snowplow-accident-bodycam-nc-melas-contd-vpx.cnn",
|
||||||
|
"https://www.chase.com/",
|
||||||
|
"https://www.npr.org/2026/04/26/g-s1-118359/supreme-court-geofencing-explainer-video",
|
||||||
|
"https://www.cnn.com/videos/travel/2023/03/17/pilot-lands-on-dubai-helipad-cprog-orig-aw-ao.cnn",
|
||||||
"https://www.amazon.com/",
|
"https://www.amazon.com/",
|
||||||
"https://www.cdc.gov/"
|
"https://www.cdc.gov/",
|
||||||
|
"https://www.target.com/",
|
||||||
|
"https://www.cnn.com/2023/04/18/tech/lina-khan-ai-warning/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.usa.gov/",
|
||||||
"https://www.yahoo.com/",
|
|
||||||
"https://www.target.com/",
|
"https://www.target.com/",
|
||||||
"https://www.npr.org/",
|
"https://www.npr.org/sections/the-picture-show/2026/04/26/g-s1-118806/photos-the-aftermath-of-the-white-house-correspondents-dinner-shooting",
|
||||||
"https://www.weather.com/",
|
"https://www.cnn.com/cnn-underscored/reviews/mmmat-silicone-mats?iid=CNNUnderscoredHPcontainer",
|
||||||
"https://www.amazon.com/",
|
"https://www.amazon.com/",
|
||||||
|
"https://www.harvard.edu/",
|
||||||
|
"https://www.cnn.com/2023/04/18/tech/lina-khan-ai-warning/index.html",
|
||||||
|
"https://www.usps.com/",
|
||||||
|
"https://www.bankofamerica.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/us/mccurtain-county-oklahoma-officials-recording/index.html",
|
||||||
|
"https://www.walmart.com/",
|
||||||
"https://www.cdc.gov/",
|
"https://www.cdc.gov/",
|
||||||
"https://www.mercurynews.com/"
|
"https://www.npr.org/2026/04/26/g-s1-118359/supreme-court-geofencing-explainer-video",
|
||||||
|
"https://www.cnn.com/cnn-underscored/deals/dyson-supersonic-sale-2023-04-17?iid=CNNUnderscoredHPcontainer?iid=CNNUnderscoredHPcontainer",
|
||||||
|
"https://www.cnn.com/2023/04/18/media/netflix-dvd-red-envelopes/index.html",
|
||||||
|
"https://www.chase.com/",
|
||||||
|
"https://www.cnn.com/videos/us/2023/04/18/jeremy-renner-snowplow-accident-bodycam-nc-melas-contd-vpx.cnn",
|
||||||
|
"https://www.npr.org/2026/04/26/nx-s1-5800054/iran-talks-on-hold-shooting-talks-pakistan",
|
||||||
|
"https://www.cnn.com/travel/article/high-speed-rail-us/index.html",
|
||||||
|
"https://www.cnn.com/2023/04/17/media/dominion-fox-news-allegations/index.html",
|
||||||
|
"https://www.cnn.com/2023/04/18/politics/clarence-thomas-ethics-democrats/index.html",
|
||||||
|
"https://www.cnn.com/2023/04/17/economy/china-gdp-q1-2023-intl-hnk/index.html",
|
||||||
|
"https://www.cnn.com/2023/04/16/entertainment/jeremy-renner-update/index.html",
|
||||||
|
"https://www.irs.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 - 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/17/media/dominion-fox-news-allegations/index.html",
|
||||||
|
"https://www.npr.org/2026/04/26/nx-s1-5800054/iran-talks-on-hold-shooting-talks-pakistan",
|
||||||
|
"https://www.walmart.com/",
|
||||||
|
"https://www.npr.org/2026/04/26/g-s1-118359/supreme-court-geofencing-explainer-video",
|
||||||
|
"https://www.npr.org/sections/the-picture-show/2026/04/26/g-s1-118806/photos-the-aftermath-of-the-white-house-correspondents-dinner-shooting",
|
||||||
|
"https://www.irs.gov/",
|
||||||
|
"https://www.cnn.com/2023/04/17/economy/china-gdp-q1-2023-intl-hnk/index.html",
|
||||||
|
"https://www.cnn.com/2023/04/18/media/netflix-dvd-red-envelopes/index.html",
|
||||||
|
"https://www.cnn.com/cnn-underscored/deals/dyson-supersonic-sale-2023-04-17?iid=CNNUnderscoredHPcontainer?iid=CNNUnderscoredHPcontainer",
|
||||||
|
"https://www.cnn.com/videos/us/2023/04/18/jeremy-renner-snowplow-accident-bodycam-nc-melas-contd-vpx.cnn",
|
||||||
|
"https://www.cnn.com/travel/article/high-speed-rail-us/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.harvard.edu/",
|
||||||
|
"https://www.chase.com/",
|
||||||
|
"https://www.bankofamerica.com/",
|
||||||
|
"https://www.usps.com/",
|
||||||
|
"https://www.cnn.com/cnn-underscored/reviews/mmmat-silicone-mats?iid=CNNUnderscoredHPcontainer",
|
||||||
|
"https://www.cdc.gov/",
|
||||||
|
"https://www.cnn.com/2023/04/16/entertainment/jeremy-renner-update/index.html",
|
||||||
|
"https://www.target.com/",
|
||||||
|
"https://www.amazon.com/",
|
||||||
|
"https://www.cnn.com/2023/04/18/tech/lina-khan-ai-warning/index.html",
|
||||||
|
"https://www.cnn.com/2023/04/18/politics/clarence-thomas-ethics-democrats/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/"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -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.irs.gov/",
|
||||||
|
"https://www.cnn.com/2023/04/18/us/mccurtain-county-oklahoma-officials-recording/index.html",
|
||||||
|
"https://www.usps.com/",
|
||||||
|
"https://www.bankofamerica.com/",
|
||||||
|
"https://www.cnn.com/2023/04/16/entertainment/jeremy-renner-update/index.html",
|
||||||
|
"https://www.cnn.com/travel/article/high-speed-rail-us/index.html",
|
||||||
|
"https://www.cnn.com/2023/04/18/media/netflix-dvd-red-envelopes/index.html",
|
||||||
|
"https://www.cnn.com/cnn-underscored/reviews/mmmat-silicone-mats?iid=CNNUnderscoredHPcontainer",
|
||||||
|
"https://www.cnn.com/2023/04/17/economy/china-gdp-q1-2023-intl-hnk/index.html",
|
||||||
|
"https://www.walmart.com/",
|
||||||
|
"https://www.cnn.com/videos/us/2023/04/18/jeremy-renner-snowplow-accident-bodycam-nc-melas-contd-vpx.cnn",
|
||||||
|
"https://www.cnn.com/2023/04/18/tech/lina-khan-ai-warning/index.html",
|
||||||
|
"https://www.cnn.com/2023/04/17/media/dominion-fox-news-allegations/index.html",
|
||||||
|
"https://www.usa.gov/",
|
||||||
|
"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/26/nx-s1-5800054/iran-talks-on-hold-shooting-talks-pakistan",
|
||||||
|
"https://www.npr.org/sections/the-picture-show/2026/04/26/g-s1-118806/photos-the-aftermath-of-the-white-house-correspondents-dinner-shooting",
|
||||||
|
"https://www.amazon.com/",
|
||||||
|
"https://www.chase.com/",
|
||||||
|
"https://www.cnn.com/2023/04/18/politics/clarence-thomas-ethics-democrats/index.html",
|
||||||
|
"https://www.target.com/",
|
||||||
|
"https://www.harvard.edu/",
|
||||||
|
"https://www.cnn.com/cnn-underscored/deals/dyson-supersonic-sale-2023-04-17?iid=CNNUnderscoredHPcontainer?iid=CNNUnderscoredHPcontainer",
|
||||||
|
"https://www.cdc.gov/",
|
||||||
|
"https://www.npr.org/2026/04/26/g-s1-118359/supreme-court-geofencing-explainer-video"
|
||||||
|
],
|
||||||
|
"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/cnn-underscored/deals/dyson-supersonic-sale-2023-04-17?iid=CNNUnderscoredHPcontainer?iid=CNNUnderscoredHPcontainer",
|
||||||
|
"https://www.target.com/",
|
||||||
|
"https://www.npr.org/2026/04/26/nx-s1-5800054/iran-talks-on-hold-shooting-talks-pakistan",
|
||||||
|
"https://www.cnn.com/videos/us/2023/04/18/jeremy-renner-snowplow-accident-bodycam-nc-melas-contd-vpx.cnn",
|
||||||
|
"https://www.harvard.edu/",
|
||||||
|
"https://www.cnn.com/2023/04/17/economy/china-gdp-q1-2023-intl-hnk/index.html",
|
||||||
|
"https://www.usps.com/",
|
||||||
|
"https://www.usa.gov/",
|
||||||
|
"https://www.amazon.com/",
|
||||||
|
"https://www.chase.com/",
|
||||||
|
"https://www.cnn.com/videos/travel/2023/03/17/pilot-lands-on-dubai-helipad-cprog-orig-aw-ao.cnn",
|
||||||
|
"https://www.irs.gov/",
|
||||||
|
"https://www.bankofamerica.com/",
|
||||||
|
"https://www.cdc.gov/",
|
||||||
|
"https://www.cnn.com/2023/04/18/us/mccurtain-county-oklahoma-officials-recording/index.html",
|
||||||
|
"https://www.cnn.com/2023/04/18/politics/clarence-thomas-ethics-democrats/index.html",
|
||||||
|
"https://www.npr.org/2026/04/26/g-s1-118359/supreme-court-geofencing-explainer-video",
|
||||||
|
"https://www.cnn.com/2023/04/18/media/netflix-dvd-red-envelopes/index.html",
|
||||||
|
"https://www.cnn.com/2023/04/18/tech/lina-khan-ai-warning/index.html",
|
||||||
|
"https://www.cnn.com/2023/04/17/media/dominion-fox-news-allegations/index.html",
|
||||||
|
"https://www.cnn.com/travel/article/high-speed-rail-us/index.html",
|
||||||
|
"https://www.walmart.com/",
|
||||||
|
"https://www.cnn.com/cnn-underscored/reviews/mmmat-silicone-mats?iid=CNNUnderscoredHPcontainer",
|
||||||
|
"https://www.npr.org/sections/the-picture-show/2026/04/26/g-s1-118806/photos-the-aftermath-of-the-white-house-correspondents-dinner-shooting",
|
||||||
|
"https://www.cnn.com/2023/04/16/entertainment/jeremy-renner-update/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/"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -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.npr.org/sections/the-picture-show/2026/04/26/g-s1-118806/photos-the-aftermath-of-the-white-house-correspondents-dinner-shooting",
|
||||||
|
"https://www.usps.com/",
|
||||||
|
"https://www.irs.gov/",
|
||||||
|
"https://www.walmart.com/",
|
||||||
|
"https://www.npr.org/2026/04/26/g-s1-118359/supreme-court-geofencing-explainer-video",
|
||||||
|
"https://www.cdc.gov/",
|
||||||
|
"https://www.cnn.com/travel/article/high-speed-rail-us/index.html",
|
||||||
|
"https://www.cnn.com/cnn-underscored/deals/dyson-supersonic-sale-2023-04-17?iid=CNNUnderscoredHPcontainer?iid=CNNUnderscoredHPcontainer",
|
||||||
|
"https://www.usa.gov/",
|
||||||
|
"https://www.cnn.com/cnn-underscored/reviews/mmmat-silicone-mats?iid=CNNUnderscoredHPcontainer",
|
||||||
|
"https://www.cnn.com/2023/04/17/economy/china-gdp-q1-2023-intl-hnk/index.html",
|
||||||
|
"https://www.chase.com/",
|
||||||
|
"https://www.cnn.com/2023/04/18/media/netflix-dvd-red-envelopes/index.html",
|
||||||
|
"https://www.harvard.edu/",
|
||||||
|
"https://www.amazon.com/",
|
||||||
|
"https://www.bankofamerica.com/",
|
||||||
|
"https://www.cnn.com/videos/us/2023/04/18/jeremy-renner-snowplow-accident-bodycam-nc-melas-contd-vpx.cnn",
|
||||||
|
"https://www.cnn.com/2023/04/17/media/dominion-fox-news-allegations/index.html",
|
||||||
|
"https://www.cnn.com/2023/04/18/tech/lina-khan-ai-warning/index.html",
|
||||||
|
"https://www.cnn.com/2023/04/18/politics/clarence-thomas-ethics-democrats/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/16/entertainment/jeremy-renner-update/index.html",
|
||||||
|
"https://www.npr.org/2026/04/26/nx-s1-5800054/iran-talks-on-hold-shooting-talks-pakistan",
|
||||||
|
"https://www.target.com/",
|
||||||
|
"https://www.cnn.com/2023/04/18/us/mccurtain-county-oklahoma-officials-recording/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.dallasnews.com/",
|
||||||
|
"https://www.cnn.com/2023/04/17/media/dominion-fox-news-allegations/index.html",
|
||||||
|
"https://www.target.com/",
|
||||||
|
"https://www.cnn.com/cnn-underscored/deals/dyson-supersonic-sale-2023-04-17?iid=CNNUnderscoredHPcontainer?iid=CNNUnderscoredHPcontainer",
|
||||||
|
"https://www.npr.org/2026/04/26/nx-s1-5800054/iran-talks-on-hold-shooting-talks-pakistan",
|
||||||
|
"https://www.cnn.com/videos/us/2023/04/18/jeremy-renner-snowplow-accident-bodycam-nc-melas-contd-vpx.cnn",
|
||||||
|
"https://www.cnn.com/2023/04/18/media/netflix-dvd-red-envelopes/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/travel/article/high-speed-rail-us/index.html",
|
||||||
|
"https://www.nytimes.com/",
|
||||||
|
"https://www.foxnews.com/",
|
||||||
|
"https://www.amazon.com/",
|
||||||
|
"https://www.chase.com/",
|
||||||
|
"https://www.cnn.com/2023/04/18/tech/lina-khan-ai-warning/index.html",
|
||||||
|
"https://www.cnn.com/",
|
||||||
|
"https://www.cnn.com/2023/04/17/economy/china-gdp-q1-2023-intl-hnk/index.html",
|
||||||
|
"https://www.cnn.com/2023/04/16/entertainment/jeremy-renner-update/index.html",
|
||||||
|
"https://www.npr.org/2026/04/26/g-s1-118359/supreme-court-geofencing-explainer-video",
|
||||||
|
"https://www.cnn.com/2023/04/18/politics/clarence-thomas-ethics-democrats/index.html",
|
||||||
|
"https://www.texas.gov/",
|
||||||
|
"https://www.npr.org/sections/the-picture-show/2026/04/26/g-s1-118806/photos-the-aftermath-of-the-white-house-correspondents-dinner-shooting",
|
||||||
|
"https://www.cnn.com/2023/04/18/us/mccurtain-county-oklahoma-officials-recording/index.html",
|
||||||
|
"https://www.walmart.com/",
|
||||||
|
"https://www.cnn.com/cnn-underscored/reviews/mmmat-silicone-mats?iid=CNNUnderscoredHPcontainer",
|
||||||
|
"https://www.bankofamerica.com/"
|
||||||
|
],
|
||||||
|
"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.usa.gov/",
|
||||||
|
"https://www.cnn.com/2023/04/16/entertainment/jeremy-renner-update/index.html",
|
||||||
|
"https://www.npr.org/2026/04/26/nx-s1-5800054/iran-talks-on-hold-shooting-talks-pakistan",
|
||||||
|
"https://www.usps.com/",
|
||||||
|
"https://www.cnn.com/2023/04/18/tech/lina-khan-ai-warning/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.cnn.com/cnn-underscored/reviews/mmmat-silicone-mats?iid=CNNUnderscoredHPcontainer",
|
||||||
|
"https://www.cnn.com/videos/us/2023/04/18/jeremy-renner-snowplow-accident-bodycam-nc-melas-contd-vpx.cnn",
|
||||||
|
"https://www.walmart.com/",
|
||||||
|
"https://www.npr.org/sections/the-picture-show/2026/04/26/g-s1-118806/photos-the-aftermath-of-the-white-house-correspondents-dinner-shooting",
|
||||||
|
"https://www.cnn.com/2023/04/17/economy/china-gdp-q1-2023-intl-hnk/index.html",
|
||||||
|
"https://www.amazon.com/",
|
||||||
|
"https://www.cnn.com/cnn-underscored/deals/dyson-supersonic-sale-2023-04-17?iid=CNNUnderscoredHPcontainer?iid=CNNUnderscoredHPcontainer",
|
||||||
|
"https://www.cdc.gov/",
|
||||||
|
"https://www.cnn.com/2023/04/18/media/netflix-dvd-red-envelopes/index.html",
|
||||||
|
"https://www.npr.org/2026/04/26/g-s1-118359/supreme-court-geofencing-explainer-video",
|
||||||
|
"https://www.cnn.com/2023/04/18/politics/clarence-thomas-ethics-democrats/index.html",
|
||||||
|
"https://www.irs.gov/",
|
||||||
|
"https://www.cnn.com/2023/04/17/media/dominion-fox-news-allegations/index.html",
|
||||||
|
"https://www.chase.com/",
|
||||||
|
"https://www.cnn.com/travel/article/high-speed-rail-us/index.html",
|
||||||
|
"https://www.target.com/",
|
||||||
|
"https://www.harvard.edu/",
|
||||||
|
"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 - 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/cnn-underscored/deals/dyson-supersonic-sale-2023-04-17?iid=CNNUnderscoredHPcontainer?iid=CNNUnderscoredHPcontainer",
|
||||||
|
"https://www.cnn.com/2023/04/18/us/mccurtain-county-oklahoma-officials-recording/index.html",
|
||||||
|
"https://www.cdc.gov/",
|
||||||
|
"https://www.usps.com/",
|
||||||
|
"https://www.npr.org/sections/the-picture-show/2026/04/26/g-s1-118806/photos-the-aftermath-of-the-white-house-correspondents-dinner-shooting",
|
||||||
|
"https://www.cnn.com/cnn-underscored/reviews/mmmat-silicone-mats?iid=CNNUnderscoredHPcontainer",
|
||||||
|
"https://www.chase.com/",
|
||||||
|
"https://www.cnn.com/2023/04/18/politics/clarence-thomas-ethics-democrats/index.html",
|
||||||
|
"https://www.irs.gov/",
|
||||||
|
"https://www.amazon.com/",
|
||||||
|
"https://www.cnn.com/2023/04/17/economy/china-gdp-q1-2023-intl-hnk/index.html",
|
||||||
|
"https://www.cnn.com/2023/04/16/entertainment/jeremy-renner-update/index.html",
|
||||||
|
"https://www.npr.org/2026/04/26/nx-s1-5800054/iran-talks-on-hold-shooting-talks-pakistan",
|
||||||
|
"https://www.harvard.edu/",
|
||||||
|
"https://www.cnn.com/2023/04/17/media/dominion-fox-news-allegations/index.html",
|
||||||
|
"https://www.cnn.com/travel/article/high-speed-rail-us/index.html",
|
||||||
|
"https://www.cnn.com/2023/04/18/media/netflix-dvd-red-envelopes/index.html",
|
||||||
|
"https://www.cnn.com/videos/travel/2023/03/17/pilot-lands-on-dubai-helipad-cprog-orig-aw-ao.cnn",
|
||||||
|
"https://www.walmart.com/",
|
||||||
|
"https://www.bankofamerica.com/",
|
||||||
|
"https://www.cnn.com/videos/us/2023/04/18/jeremy-renner-snowplow-accident-bodycam-nc-melas-contd-vpx.cnn",
|
||||||
|
"https://www.target.com/",
|
||||||
|
"https://www.cnn.com/2023/04/18/tech/lina-khan-ai-warning/index.html",
|
||||||
|
"https://www.npr.org/2026/04/26/g-s1-118359/supreme-court-geofencing-explainer-video",
|
||||||
|
"https://www.usa.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/"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -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://chinhphu.vn/",
|
|
||||||
"https://vnexpress.net/",
|
|
||||||
"https://tuoitre.vn/",
|
|
||||||
"https://vtv.vn/",
|
|
||||||
"https://shopee.vn/",
|
"https://shopee.vn/",
|
||||||
"https://tiki.vn/"
|
"https://dichvucong.gov.vn/",
|
||||||
|
"https://vnu.edu.vn/",
|
||||||
|
"https://vnexpress.net/toi-va-ban-cua-chong-lo-danh-tinh-cam-cho-nhau-5067367.html",
|
||||||
|
"https://vnexpress.net/nuoc-nao-co-nhieu-lo-dien-hat-nhan-nhat-the-gioi-5067357.html",
|
||||||
|
"https://vnexpress.net/be-trai-3-tuoi-di-lac-trong-dem-duoc-tim-thay-5067400.html",
|
||||||
|
"https://vnexpress.net/nhieu-diem-du-lich-that-thu-ngay-thu-hai-nghi-le-gio-to-5067293.html",
|
||||||
|
"https://vnexpress.net/de-xuat-hon-120-000-ty-dong-xay-cao-toc-ha-tien-rach-gia-bac-lieu-5067424.html",
|
||||||
|
"https://vnexpress.net/nhung-phut-hon-loan-trong-vu-no-sung-o-noi-ong-trump-du-tiec-5067440.html",
|
||||||
|
"https://vnexpress.net/nam-sinh-phu-tho-gianh-ve-vao-chung-ket-olympia-dung-ngay-gio-to-5067411.html",
|
||||||
|
"https://vnexpress.net/y-nghia-trong-ten-lebanon-lien-quan-den-mau-sac-nao-5065575.html",
|
||||||
|
"https://vnexpress.net/toi-tinh-ngo-vi-mua-5-trieu-dong-hai-san-lam-qua-sau-chuyen-du-lich-5067382.html",
|
||||||
|
"https://vnexpress.net/lanh-dao-the-gioi-soc-voi-vu-no-sung-o-bua-tiec-co-ong-trump-5067380.html",
|
||||||
|
"https://vnexpress.net/thuc-long-mong-muon-tim-nguoi-ban-doi-5066529.html",
|
||||||
|
"https://chinhphu.vn/",
|
||||||
|
"https://tiki.vn/",
|
||||||
|
"https://vnexpress.net/huong-giang-va-dan-my-nhan-ung-vien-vuong-mien-miss-grand-5067360.html",
|
||||||
|
"https://vnexpress.net/3-thu-pham-an-minh-khien-cholesterol-xau-tang-vot-5066465.html",
|
||||||
|
"https://vnexpress.net/chay-thu-cung-duong-vm-green-paradise-can-gio-5067395.html",
|
||||||
|
"https://www.vietcombank.com.vn/",
|
||||||
|
"https://vnexpress.net/dung-xem-nhe-nhung-cuon-sach-co-tich-5067368.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/"
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -5,17 +5,27 @@
|
|||||||
# 核心功能: 部署/卸载调度中枢、SQLite 资产管理、平滑热更新引擎
|
# 核心功能: 部署/卸载调度中枢、SQLite 资产管理、平滑热更新引擎
|
||||||
# ==========================================================
|
# ==========================================================
|
||||||
|
|
||||||
|
# ==========================================================
|
||||||
|
# 🛑 核心权限防线: 检查是否以 root 权限运行
|
||||||
|
# ==========================================================
|
||||||
|
if [ "$EUID" -ne 0 ]; then
|
||||||
|
echo -e "\033[31m❌ 权限被拒绝: 部署 IP-Sentinel 需要最高系统权限。\033[0m"
|
||||||
|
echo -e "💡 请切换到 root 用户 (执行 su root 或 sudo -i) 后重新运行指令。"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
# 你的 GitHub 仓库 Raw 数据直链前缀
|
# 你的 GitHub 仓库 Raw 数据直链前缀
|
||||||
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/dev-v3.6.0"
|
# REPO_RAW_URL="https://raw.githubusercontent.com/hotyue/IP-Sentinel/v3.6.2-rc"
|
||||||
|
|
||||||
# [核心: 动态提取 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"
|
||||||
@@ -25,58 +35,81 @@ echo "========================================================"
|
|||||||
echo " 🧠 欢迎使用 IP-Sentinel Master (控制中枢) v${TARGET_VERSION}"
|
echo " 🧠 欢迎使用 IP-Sentinel Master (控制中枢) v${TARGET_VERSION}"
|
||||||
echo "========================================================"
|
echo "========================================================"
|
||||||
|
|
||||||
# [新增] 交互式操作菜单:支持选择部署或调用卸载程序
|
# ==========================================================
|
||||||
echo -e "\n请选择操作:"
|
# [v3.6.1 核心] 拦截司令部静默 OTA 升级模式 (强行接管执行流)
|
||||||
echo " 1) 🚀 部署 Master 控制中枢"
|
# ==========================================================
|
||||||
echo " 2) 🗑️ 一键卸载 Master 中枢"
|
if [ "$SILENT_MASTER_OTA" == "true" ]; then
|
||||||
read -p "请输入选择 [1-2] (默认1): " ACTION_CHOICE
|
echo -e "\n⏳ [OTA] 中枢重构指令已确认,正在剥离控制台交互..."
|
||||||
|
ACTION_CHOICE=1
|
||||||
# [v3.5.2 修复] 防止用户直接回车导致变量为空,从而漏过下方的平滑升级判定被误删档
|
UPGRADE_MODE="true"
|
||||||
ACTION_CHOICE=${ACTION_CHOICE:-1}
|
KEEP_DB="true"
|
||||||
|
|
||||||
if [ "$ACTION_CHOICE" == "2" ]; then
|
# 汲取原配置进入内存
|
||||||
echo -e "\n⏳ 正在拉取卸载程序..."
|
if [ -f "${MASTER_DIR}/master.conf" ]; then
|
||||||
# [新增逻辑] 使用上面定义的 REPO_RAW_URL 动态拉取卸载脚本,执行后自动销毁临时文件
|
|
||||||
curl -sL "${REPO_RAW_URL}/master/uninstall_master.sh" -o "/tmp/uninstall_master.sh"
|
|
||||||
chmod +x "/tmp/uninstall_master.sh"
|
|
||||||
bash "/tmp/uninstall_master.sh"
|
|
||||||
rm -f "/tmp/uninstall_master.sh"
|
|
||||||
exit 0
|
|
||||||
fi
|
|
||||||
|
|
||||||
# ================== [v3.2.2 新增: 平滑升级模式嗅探] ==================
|
|
||||||
UPGRADE_MODE="false"
|
|
||||||
KEEP_DB="true"
|
|
||||||
|
|
||||||
if [ "$ACTION_CHOICE" == "1" ] && [ -f "${MASTER_DIR}/master.conf" ]; then
|
|
||||||
echo -e "\n\033[33m💡 司令部雷达提示:检测到本机已部署过 Master 中枢。\033[0m"
|
|
||||||
read -p "👉 是否按原配置直接进行平滑升级?(y/n, 默认y): " UPGRADE_CHOICE
|
|
||||||
if [[ -z "$UPGRADE_CHOICE" || "$UPGRADE_CHOICE" =~ ^[Yy]$ ]]; then
|
|
||||||
UPGRADE_MODE="true"
|
|
||||||
read -p "👉 是否保留历史节点数据库 (SQLite)?(y/n, 默认y): " DB_CHOICE
|
|
||||||
if [[ "$DB_CHOICE" =~ ^[Nn]$ ]]; then
|
|
||||||
KEEP_DB="false"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# 汲取原配置进入内存
|
|
||||||
source "${MASTER_DIR}/master.conf"
|
source "${MASTER_DIR}/master.conf"
|
||||||
|
|
||||||
# [v3.4.0 核心] 升级后立即同步/补录版本号至配置文件
|
# 同步新版本号至配置文件
|
||||||
if grep -q "^MASTER_VERSION=" "${MASTER_DIR}/master.conf"; then
|
if grep -q "^MASTER_VERSION=" "${MASTER_DIR}/master.conf"; then
|
||||||
sed -i "s/^MASTER_VERSION=.*/MASTER_VERSION=\"$TARGET_VERSION\"/" "${MASTER_DIR}/master.conf"
|
sed -i "s/^MASTER_VERSION=.*/MASTER_VERSION=\"$TARGET_VERSION\"/" "${MASTER_DIR}/master.conf"
|
||||||
else
|
else
|
||||||
echo "MASTER_VERSION=\"$TARGET_VERSION\"" >> "${MASTER_DIR}/master.conf"
|
echo "MASTER_VERSION=\"$TARGET_VERSION\"" >> "${MASTER_DIR}/master.conf"
|
||||||
fi
|
fi
|
||||||
|
fi
|
||||||
echo -e "\033[32m✅ 已激活 [平滑升级模式],版本已锚定为 v${TARGET_VERSION}...\033[0m"
|
echo -e "\033[32m✅ 已激活 [中枢静默重构模式],即将无损覆写内核...\033[0m"
|
||||||
else
|
else
|
||||||
echo -e "\033[33m🔄 您选择了重新配置,旧的中枢数据将被彻底抹除。\033[0m"
|
# [新增] 交互式操作菜单:支持选择部署或调用卸载程序
|
||||||
|
echo -e "\n请选择操作:"
|
||||||
|
echo " 1) 🚀 部署 Master 控制中枢"
|
||||||
|
echo " 2) 🗑️ 一键卸载 Master 中枢"
|
||||||
|
read -p "请输入选择 [1-2] (默认1): " ACTION_CHOICE
|
||||||
|
|
||||||
|
# [v3.5.2 修复] 防止用户直接回车导致变量为空,从而漏过下方的平滑升级判定被误删档
|
||||||
|
ACTION_CHOICE=${ACTION_CHOICE:-1}
|
||||||
|
|
||||||
|
if [ "$ACTION_CHOICE" == "2" ]; then
|
||||||
|
echo -e "\n⏳ 正在拉取卸载程序..."
|
||||||
|
curl -sL "${REPO_RAW_URL}/master/uninstall_master.sh" -o "/tmp/uninstall_master.sh"
|
||||||
|
chmod +x "/tmp/uninstall_master.sh"
|
||||||
|
bash "/tmp/uninstall_master.sh"
|
||||||
|
rm -f "/tmp/uninstall_master.sh"
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
|
||||||
|
# ================== [v3.2.2 新增: 平滑升级模式嗅探] ==================
|
||||||
|
UPGRADE_MODE="false"
|
||||||
|
KEEP_DB="true"
|
||||||
|
|
||||||
|
if [ "$ACTION_CHOICE" == "1" ] && [ -f "${MASTER_DIR}/master.conf" ]; then
|
||||||
|
echo -e "\n\033[33m💡 司令部雷达提示:检测到本机已部署过 Master 中枢。\033[0m"
|
||||||
|
read -p "👉 是否按原配置直接进行平滑升级?(y/n, 默认y): " UPGRADE_CHOICE
|
||||||
|
if [[ -z "$UPGRADE_CHOICE" || "$UPGRADE_CHOICE" =~ ^[Yy]$ ]]; then
|
||||||
|
UPGRADE_MODE="true"
|
||||||
|
read -p "👉 是否保留历史节点数据库 (SQLite)?(y/n, 默认y): " DB_CHOICE
|
||||||
|
if [[ "$DB_CHOICE" =~ ^[Nn]$ ]]; then
|
||||||
|
KEEP_DB="false"
|
||||||
|
fi
|
||||||
|
|
||||||
|
source "${MASTER_DIR}/master.conf"
|
||||||
|
|
||||||
|
if grep -q "^MASTER_VERSION=" "${MASTER_DIR}/master.conf"; then
|
||||||
|
sed -i "s/^MASTER_VERSION=.*/MASTER_VERSION=\"$TARGET_VERSION\"/" "${MASTER_DIR}/master.conf"
|
||||||
|
else
|
||||||
|
echo "MASTER_VERSION=\"$TARGET_VERSION\"" >> "${MASTER_DIR}/master.conf"
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo -e "\033[32m✅ 已激活 [平滑升级模式],版本已锚定为 v${TARGET_VERSION}...\033[0m"
|
||||||
|
else
|
||||||
|
echo -e "\033[33m🔄 您选择了重新配置,旧的中枢数据将被彻底抹除。\033[0m"
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
# ====================================================================
|
|
||||||
|
|
||||||
# ================== [v3.2.2 优化: 安装前环境纯净度清理与数据保护] ==================
|
# ================== [v3.2.2 优化: 安装前环境纯净度清理与数据保护] ==================
|
||||||
echo -e "\n⏳ 正在清理旧版 Master 守护进程..."
|
echo -e "\n⏳ 正在清理旧版 Master 守护进程..."
|
||||||
|
# [新增] 优雅停止 Systemd 服务,防止代码替换时引发无限复活风暴
|
||||||
|
if command -v systemctl >/dev/null 2>&1; then
|
||||||
|
systemctl stop ip-sentinel-master.service >/dev/null 2>&1 || true
|
||||||
|
fi
|
||||||
pkill -9 -f "tg_master.sh" >/dev/null 2>&1 || true
|
pkill -9 -f "tg_master.sh" >/dev/null 2>&1 || true
|
||||||
|
|
||||||
if [ "$UPGRADE_MODE" == "true" ]; then
|
if [ "$UPGRADE_MODE" == "true" ]; then
|
||||||
@@ -96,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=()
|
||||||
|
|
||||||
# 基础探测:预检查缺失的命令
|
# 基础探测:预检查缺失的命令
|
||||||
@@ -114,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
|
||||||
|
|
||||||
@@ -169,9 +210,22 @@ if [ "$UPGRADE_MODE" == "false" ]; then
|
|||||||
GATEWAY_TYPE=${GATEWAY_TYPE:-1}
|
GATEWAY_TYPE=${GATEWAY_TYPE:-1}
|
||||||
|
|
||||||
IS_OFFICIAL_GATEWAY="false"
|
IS_OFFICIAL_GATEWAY="false"
|
||||||
|
ENABLE_MASTER_OTA="false"
|
||||||
if [ "$GATEWAY_TYPE" == "2" ]; then
|
if [ "$GATEWAY_TYPE" == "2" ]; then
|
||||||
IS_OFFICIAL_GATEWAY="true"
|
IS_OFFICIAL_GATEWAY="true"
|
||||||
echo -e "\033[33m⚠️ 已开启官方公共网关模式,全局 OTA 按钮将被屏蔽。\033[0m"
|
echo -e "\033[33m⚠️ 已开启官方公共网关模式,全舰队与司令部的 OTA 将被强制屏蔽。\033[0m"
|
||||||
|
else
|
||||||
|
# [v3.6.1] 私有模式开放中枢 OTA 授权向导
|
||||||
|
echo -e "\n[2.1/4] 司令部自我进化授权"
|
||||||
|
echo -e "💡 开启后,您可以在 TG 菜单一键将中枢核心系统热更新至最新版本。"
|
||||||
|
read -p "是否允许司令部接收 OTA 重构指令?(y/n, 默认y): " M_OTA_CHOICE
|
||||||
|
if [[ "$M_OTA_CHOICE" =~ ^[Nn]$ ]]; then
|
||||||
|
ENABLE_MASTER_OTA="false"
|
||||||
|
echo -e "🛡️ \033[33m已关闭司令部 OTA 权限,中枢内核未来仅支持 SSH 升级。\033[0m"
|
||||||
|
else
|
||||||
|
ENABLE_MASTER_OTA="true"
|
||||||
|
echo -e "✅ \033[32m已开启司令部 OTA 权限,金蝉脱壳引信已挂载。\033[0m"
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
cat > "${MASTER_DIR}/master.conf" << EOF
|
cat > "${MASTER_DIR}/master.conf" << EOF
|
||||||
@@ -182,14 +236,19 @@ DB_FILE="$DB_FILE"
|
|||||||
MASTER_DIR="$MASTER_DIR"
|
MASTER_DIR="$MASTER_DIR"
|
||||||
# [v3.6.0 核心] 官方网关 UI 熔断标识
|
# [v3.6.0 核心] 官方网关 UI 熔断标识
|
||||||
IS_OFFICIAL_GATEWAY="$IS_OFFICIAL_GATEWAY"
|
IS_OFFICIAL_GATEWAY="$IS_OFFICIAL_GATEWAY"
|
||||||
|
# [v3.6.1 新增] 司令部自身 OTA 授权标识
|
||||||
|
ENABLE_MASTER_OTA="$ENABLE_MASTER_OTA"
|
||||||
EOF
|
EOF
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# [v3.6.0 热修复] 老司令部平滑升级时,自动补齐该字段并默认为 false
|
# [v3.6.1 热修复] 老司令部平滑升级时,自动补齐缺失字段
|
||||||
if [ "$UPGRADE_MODE" == "true" ]; then
|
if [ "$UPGRADE_MODE" == "true" ]; then
|
||||||
if ! grep -q "^IS_OFFICIAL_GATEWAY=" "${MASTER_DIR}/master.conf"; then
|
if ! grep -q "^IS_OFFICIAL_GATEWAY=" "${MASTER_DIR}/master.conf"; then
|
||||||
echo "IS_OFFICIAL_GATEWAY=\"false\"" >> "${MASTER_DIR}/master.conf"
|
echo "IS_OFFICIAL_GATEWAY=\"false\"" >> "${MASTER_DIR}/master.conf"
|
||||||
fi
|
fi
|
||||||
|
if ! grep -q "^ENABLE_MASTER_OTA=" "${MASTER_DIR}/master.conf"; then
|
||||||
|
echo "ENABLE_MASTER_OTA=\"false\"" >> "${MASTER_DIR}/master.conf"
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
# 🛑 拦截块结束
|
# 🛑 拦截块结束
|
||||||
|
|
||||||
@@ -209,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"
|
||||||
|
|
||||||
@@ -223,20 +293,64 @@ echo -e "\n[4/4] 部署 TG 调度守护进程..."
|
|||||||
curl -sL "${REPO_RAW_URL}/master/tg_master.sh" -o "${MASTER_DIR}/tg_master.sh"
|
curl -sL "${REPO_RAW_URL}/master/tg_master.sh" -o "${MASTER_DIR}/tg_master.sh"
|
||||||
chmod +x "${MASTER_DIR}/tg_master.sh"
|
chmod +x "${MASTER_DIR}/tg_master.sh"
|
||||||
|
|
||||||
# 写入看门狗 Cron (容错版)
|
if command -v systemctl >/dev/null 2>&1; then
|
||||||
crontab -l 2>/dev/null | grep -v "tg_master.sh" > /tmp/cron_master || true
|
echo "💡 检测到 Systemd 环境,正在部署原生守护服务..."
|
||||||
echo "* * * * * pgrep -f tg_master.sh >/dev/null || nohup bash ${MASTER_DIR}/tg_master.sh >/dev/null 2>&1 &" >> /tmp/cron_master
|
|
||||||
[ -f /tmp/cron_master ] && crontab /tmp/cron_master 2>/dev/null
|
cat > /etc/systemd/system/ip-sentinel-master.service << EOF
|
||||||
rm -f /tmp/cron_master
|
[Unit]
|
||||||
|
Description=IP-Sentinel Master Command Center Service
|
||||||
|
After=network.target
|
||||||
|
|
||||||
# 立刻启动 (追加 disown 彻底脱离终端管控,实现绝对静默)
|
[Service]
|
||||||
pgrep -f tg_master.sh >/dev/null || { nohup bash "${MASTER_DIR}/tg_master.sh" >/dev/null 2>&1 & disown 2>/dev/null; }
|
Environment="PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
|
||||||
|
SyslogIdentifier=ip-sentinel
|
||||||
|
Type=simple
|
||||||
|
ExecStart=/bin/bash ${MASTER_DIR}/tg_master.sh
|
||||||
|
Restart=always
|
||||||
|
RestartSec=5
|
||||||
|
User=root
|
||||||
|
WorkingDirectory=${MASTER_DIR}
|
||||||
|
CPUSchedulingPolicy=idle
|
||||||
|
IOSchedulingClass=idle
|
||||||
|
|
||||||
# ================== [v3.2.2 优化: 战报文案分流] ==================
|
[Install]
|
||||||
|
WantedBy=multi-user.target
|
||||||
|
EOF
|
||||||
|
|
||||||
|
systemctl daemon-reload
|
||||||
|
systemctl enable --now ip-sentinel-master.service
|
||||||
|
systemctl restart ip-sentinel-master.service
|
||||||
|
|
||||||
|
# 清理可能残留的历史 Cron
|
||||||
|
crontab -l 2>/dev/null | grep -v "tg_master.sh" > /tmp/cron_master || true
|
||||||
|
[ -f /tmp/cron_master ] && crontab /tmp/cron_master 2>/dev/null
|
||||||
|
rm -f /tmp/cron_master
|
||||||
|
else
|
||||||
|
echo "💡 未检测到 Systemd,回退到 Cron 看门狗调度模式..."
|
||||||
|
crontab -l 2>/dev/null | grep -v "tg_master.sh" > /tmp/cron_master || true
|
||||||
|
echo "* * * * * pgrep -f tg_master.sh >/dev/null || nohup bash ${MASTER_DIR}/tg_master.sh >/dev/null 2>&1 &" >> /tmp/cron_master
|
||||||
|
[ -f /tmp/cron_master ] && crontab /tmp/cron_master 2>/dev/null
|
||||||
|
rm -f /tmp/cron_master
|
||||||
|
|
||||||
|
pgrep -f tg_master.sh >/dev/null || { nohup bash "${MASTER_DIR}/tg_master.sh" >/dev/null 2>&1 & disown 2>/dev/null; }
|
||||||
|
fi
|
||||||
|
|
||||||
|
# ================== [v3.2.2 优化 & v3.6.1 OTA捷报: 战报文案分流] ==================
|
||||||
echo "========================================================"
|
echo "========================================================"
|
||||||
if [ "$UPGRADE_MODE" == "true" ]; then
|
if [ "$UPGRADE_MODE" == "true" ]; then
|
||||||
echo "🎉 Master 控制中枢平滑热更新完成!"
|
echo "🎉 Master 控制中枢平滑热更新完成!"
|
||||||
echo "🤖 新版中枢引擎已接管数据库,继续等待边缘节点汇报。"
|
echo "🤖 新版中枢引擎已接管数据库,继续等待边缘节点汇报。"
|
||||||
|
|
||||||
|
# [v3.6.1 核心] 静默 OTA 完成后,由幽灵进程主动向指挥官发送捷报
|
||||||
|
if [ "$SILENT_MASTER_OTA" == "true" ] && [ -n "$OTA_CHAT_ID" ] && [ -n "$TG_TOKEN" ]; then
|
||||||
|
echo -e "\n📡 正在向指挥官发送司令部重构捷报..."
|
||||||
|
curl -s -X POST "https://api.telegram.org/bot${TG_TOKEN}/sendMessage" \
|
||||||
|
-d "chat_id=${OTA_CHAT_ID}" \
|
||||||
|
-d "parse_mode=Markdown" \
|
||||||
|
-d "text=✨ *司令部中枢热重载完成!*
|
||||||
|
🚀 当前内核已跃升至:\`v${TARGET_VERSION}\`
|
||||||
|
🤖 新版金蝉脱壳引擎已接管阵地,全舰队指控链路恢复正常。" > /dev/null
|
||||||
|
fi
|
||||||
else
|
else
|
||||||
echo "🎉 Master 控制中枢部署完成!"
|
echo "🎉 Master 控制中枢部署完成!"
|
||||||
echo "🤖 机器人现已开始全局接客,等待边缘节点注册。"
|
echo "🤖 机器人现已开始全局接客,等待边缘节点注册。"
|
||||||
@@ -245,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/dev-v3.6.0"
|
|
||||||
# MASTER_VERSION 已经在上方的 source "$CONF" 中被载入
|
# MASTER_VERSION 已经在上方的 source "$CONF" 中被载入
|
||||||
# 如果本地极度陈旧没有该变量,才给定一个基础兜底值,避免变量为空导致崩溃
|
# 如果本地极度陈旧没有该变量,才给定一个基础兜底值,避免变量为空导致崩溃
|
||||||
MASTER_VERSION=${MASTER_VERSION:-"3.5.0"}
|
MASTER_VERSION=${MASTER_VERSION:-"3.5.0"}
|
||||||
@@ -21,33 +20,53 @@ 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 -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" \
|
||||||
-d "{\"chat_id\":\"$1\",\"text\":\"$2\",\"parse_mode\":\"Markdown\",\"reply_markup\":{\"inline_keyboard\":$3}}" > /dev/null
|
-d "{\"chat_id\":\"$1\",\"text\":\"$2\",\"parse_mode\":\"Markdown\",\"reply_markup\":{\"inline_keyboard\":$3}}" > /dev/null
|
||||||
}
|
}
|
||||||
|
|
||||||
send_msg() {
|
send_msg() {
|
||||||
curl -s -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" \
|
||||||
-d "chat_id=$1" -d "text=$2" -d "parse_mode=Markdown" > /dev/null
|
-d "chat_id=$1" -d "text=$2" -d "parse_mode=Markdown" > /dev/null
|
||||||
}
|
}
|
||||||
|
|
||||||
# ================== [v3.0.1 新增: 消息原位刷新函数] ==================
|
# ================== [v3.0.1 新增: 消息原位刷新函数] ==================
|
||||||
edit_msg() {
|
edit_msg() {
|
||||||
curl -s -X POST "https://api.telegram.org/bot${TG_TOKEN}/editMessageText" \
|
curl -s --connect-timeout 5 -m 10 -X POST "https://api.telegram.org/bot${TG_TOKEN}/editMessageText" \
|
||||||
-d "chat_id=$1" -d "message_id=$2" -d "text=$3" -d "parse_mode=Markdown" > /dev/null
|
-d "chat_id=$1" -d "message_id=$2" -d "text=$3" -d "parse_mode=Markdown" > /dev/null
|
||||||
}
|
}
|
||||||
|
|
||||||
# [v3.5.3 新增: 支持内联键盘的原位 UI 重绘函数]
|
# [v3.5.3 新增: 支持内联键盘的原位 UI 重绘函数]
|
||||||
edit_ui() {
|
edit_ui() {
|
||||||
curl -s -X POST "https://api.telegram.org/bot${TG_TOKEN}/editMessageText" \
|
curl -s --connect-timeout 5 -m 10 -X POST "https://api.telegram.org/bot${TG_TOKEN}/editMessageText" \
|
||||||
-H "Content-Type: application/json" \
|
-H "Content-Type: application/json" \
|
||||||
-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,10 +102,23 @@ 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)
|
||||||
UPDATES=$(curl -s "https://api.telegram.org/bot${TG_TOKEN}/getUpdates?offset=${OFFSET}&timeout=30")
|
UPDATES=$(curl -s --connect-timeout 5 -m 35 "https://api.telegram.org/bot${TG_TOKEN}/getUpdates?offset=${OFFSET}&timeout=30")
|
||||||
|
|
||||||
COUNT=$(echo "$UPDATES" | jq -r '.result | length' 2>/dev/null)
|
COUNT=$(echo "$UPDATES" | jq -r '.result | length' 2>/dev/null)
|
||||||
|
|
||||||
@@ -92,6 +129,49 @@ 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')
|
||||||
|
|
||||||
|
# ================== [基础消息解析提取提前] ==================
|
||||||
|
# [致命 Bug 修复] 必须在 svq 入库判断前提取这俩变量,否则入库后无法重绘 UI
|
||||||
|
CB_ID=$(echo "$UPDATE" | jq -r '.callback_query.id // empty')
|
||||||
|
MSG_ID=$(echo "$UPDATE" | jq -r '.callback_query.message.message_id // empty')
|
||||||
|
|
||||||
|
# ================== [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');"
|
||||||
|
|
||||||
|
# [体验优化] 弹出顶部 Toast 气泡,提示入库成功
|
||||||
|
if [ -n "$CB_ID" ]; then
|
||||||
|
curl -s --connect-timeout 5 -m 10 -X POST "https://api.telegram.org/bot${TG_TOKEN}/answerCallbackQuery" \
|
||||||
|
-d "callback_query_id=${CB_ID}" \
|
||||||
|
-d "text=✅ 报告已成功录入趋势库!" \
|
||||||
|
-d "show_alert=false" > /dev/null
|
||||||
|
fi
|
||||||
|
|
||||||
|
# 2. 无损修改原消息:移除入库按钮,展示绿勾状态 (防连点机制生效)
|
||||||
|
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
|
||||||
|
else
|
||||||
|
# [异常兜底] 弹出红色警告弹窗
|
||||||
|
if [ -n "$CB_ID" ]; then
|
||||||
|
curl -s --connect-timeout 5 -m 10 -X POST "https://api.telegram.org/bot${TG_TOKEN}/answerCallbackQuery" \
|
||||||
|
-d "callback_query_id=${CB_ID}" \
|
||||||
|
-d "text=❌ 数据解析失败,入库中止。" \
|
||||||
|
-d "show_alert=true" > /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 新增: 拦截别名修改的对话回复] ==================
|
||||||
@@ -111,12 +191,9 @@ while true; do
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
# ================== [v3.0.1 新增: 消除转圈圈与获取消息ID] ==================
|
# ================== [v3.0.1 新增: 消除转圈圈与获取消息ID] ==================
|
||||||
CB_ID=$(echo "$UPDATE" | jq -r '.callback_query.id // empty')
|
# 告诉 TG 官方“指令已收到”,立刻消除按钮上的加载圈圈 (对其他常规按钮生效)
|
||||||
MSG_ID=$(echo "$UPDATE" | jq -r '.callback_query.message.message_id // empty')
|
|
||||||
|
|
||||||
# 告诉 TG 官方“指令已收到”,立刻消除按钮上的加载圈圈
|
|
||||||
if [ -n "$CB_ID" ]; then
|
if [ -n "$CB_ID" ]; then
|
||||||
curl -s -X POST "https://api.telegram.org/bot${TG_TOKEN}/answerCallbackQuery" -d "callback_query_id=${CB_ID}" > /dev/null
|
curl -s --connect-timeout 5 -m 10 -X POST "https://api.telegram.org/bot${TG_TOKEN}/answerCallbackQuery" -d "callback_query_id=${CB_ID}" > /dev/null
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# ==========================================
|
# ==========================================
|
||||||
@@ -174,12 +251,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%,}]"
|
||||||
@@ -199,17 +271,27 @@ while true; do
|
|||||||
REMOTE_VER=$(curl -s -m 2 "${REPO_RAW_URL}/version.txt" | grep "^MASTER_VERSION=" | cut -d'=' -f2 | tr -d '[:space:]')
|
REMOTE_VER=$(curl -s -m 2 "${REPO_RAW_URL}/version.txt" | grep "^MASTER_VERSION=" | cut -d'=' -f2 | tr -d '[:space:]')
|
||||||
VER_INFO="当前版本: \`v${MASTER_VERSION}\`"
|
VER_INFO="当前版本: \`v${MASTER_VERSION}\`"
|
||||||
|
|
||||||
|
BTN_MASTER_OTA=""
|
||||||
if [ -n "$REMOTE_VER" ] && [ "$REMOTE_VER" != "$MASTER_VERSION" ]; then
|
if [ -n "$REMOTE_VER" ] && [ "$REMOTE_VER" != "$MASTER_VERSION" ]; then
|
||||||
VER_INFO="${VER_INFO}\n✨ **发现新版本**: \`v${REMOTE_VER}\` (请尽快更新主控)"
|
VER_INFO="${VER_INFO}\n✨ **发现新版本**: \`v${REMOTE_VER}\` (可执行中枢热重载)"
|
||||||
|
|
||||||
|
# 仅当非官方网关 且 开启了中枢 OTA 权限时,才渲染升级按钮
|
||||||
|
if [ "$IS_OFFICIAL_GATEWAY" != "true" ] && [ "${ENABLE_MASTER_OTA:-false}" == "true" ]; then
|
||||||
|
BTN_MASTER_OTA="[{\"text\":\"🆙 升级司令部至 v${REMOTE_VER}\",\"callback_data\":\"master_ota_confirm\"}],"
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# [v3.6.0 核心] 官方网关 UI 全局熔断
|
NODE_COUNT=$(db_exec "SELECT COUNT(*) FROM nodes WHERE chat_id='$CHAT_ID';")
|
||||||
|
[ -z "$NODE_COUNT" ] && NODE_COUNT=0
|
||||||
|
|
||||||
|
# L0 扁平化重构:将司令部升级按钮动态置于最顶层
|
||||||
if [ "$IS_OFFICIAL_GATEWAY" != "true" ]; then
|
if [ "$IS_OFFICIAL_GATEWAY" != "true" ]; then
|
||||||
BTNS="[[{\"text\":\"🖥️ 我的节点列表\",\"callback_data\":\"list_nodes\"}], [{\"text\":\"🚀 全节点日报汇总\",\"callback_data\":\"all_reports\"}], [{\"text\":\"🛠️ 全节点一键维护\",\"callback_data\":\"all_run\"}], [{\"text\":\"⚠️ 全舰队 OTA 升级\",\"callback_data\":\"all_ota_confirm\"}]]"
|
BTNS="[${BTN_MASTER_OTA}[{\"text\":\"🌍 进入全球战区雷达 (管理节点)\",\"callback_data\":\"list_nodes\"}], [{\"text\":\"🚀 全军总攻\",\"callback_data\":\"all_run\"}, {\"text\":\"📊 全军简报\",\"callback_data\":\"all_reports\"}], [{\"text\":\"☢️ 全舰队 OTA 热重载\",\"callback_data\":\"all_ota_confirm\"}]]"
|
||||||
else
|
else
|
||||||
BTNS="[[{\"text\":\"🖥️ 我的节点列表\",\"callback_data\":\"list_nodes\"}], [{\"text\":\"🚀 全节点日报汇总\",\"callback_data\":\"all_reports\"}], [{\"text\":\"🛠️ 全节点一键维护\",\"callback_data\":\"all_run\"}]]"
|
BTNS="[[{\"text\":\"🌍 进入全球战区雷达 (管理节点)\",\"callback_data\":\"list_nodes\"}], [{\"text\":\"🚀 全军总攻\",\"callback_data\":\"all_run\"}, {\"text\":\"📊 全军简报\",\"callback_data\":\"all_reports\"}]]"
|
||||||
fi
|
fi
|
||||||
send_ui "$CHAT_ID" "🛡️ **IP-Sentinel 司令部**\n${VER_INFO}\n\n欢迎回来,长官。请下达指令:" "$BTNS"
|
TEXT_MSG="🛡️ **IP-Sentinel 司令部**\n${VER_INFO}\n\n📊 舰队状态: 共有 \`${NODE_COUNT}\` 台哨兵在线\n欢迎回来,长官。请下达战略指令:"
|
||||||
|
send_ui "$CHAT_ID" "$TEXT_MSG" "$BTNS"
|
||||||
;;
|
;;
|
||||||
|
|
||||||
"all_ota_confirm")
|
"all_ota_confirm")
|
||||||
@@ -226,22 +308,71 @@ 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
|
||||||
;;
|
;;
|
||||||
|
|
||||||
|
"master_ota_confirm")
|
||||||
|
CONFIRM_BTNS="[[{\"text\":\"🚨 确认重构司令部\",\"callback_data\":\"master_ota_execute\"}], [{\"text\":\"取消操作\",\"callback_data\":\"/start\"}]]"
|
||||||
|
WARNING_MSG="☢️ **【最高指令:中枢金蝉脱壳】**\n\n此操作将拉取最新源码并强行覆盖司令部核心进程。\n\n⚠️ **风险提示**:\n升级期间司令部将短暂失联(约3-5秒)。完成后会自动发送捷报。\n\n**是否确定执行司令部自我升级?**"
|
||||||
|
if [ -n "$MSG_ID" ]; then
|
||||||
|
edit_ui "$CHAT_ID" "$MSG_ID" "$WARNING_MSG" "$CONFIRM_BTNS"
|
||||||
|
else
|
||||||
|
send_ui "$CHAT_ID" "$WARNING_MSG" "$CONFIRM_BTNS"
|
||||||
|
fi
|
||||||
|
;;
|
||||||
|
|
||||||
|
"master_ota_execute")
|
||||||
|
if [ -n "$MSG_ID" ]; then
|
||||||
|
edit_msg "$CHAT_ID" "$MSG_ID" "⏳ 正在下载重构图纸,司令部即将进入静默重启..."
|
||||||
|
else
|
||||||
|
send_msg "$CHAT_ID" "⏳ 正在下载重构图纸,司令部即将进入静默重启..."
|
||||||
|
fi
|
||||||
|
|
||||||
|
# 下载最新的 master install 脚本作为幽灵进程
|
||||||
|
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"
|
||||||
|
|
||||||
|
# 抛出幽灵进程进行脱壳升级,传递静默变量与回执 ID
|
||||||
|
# [修复] 必须显式将环境变量注入到 bash -c 的指令串中,防止被 systemd-run 沙盒隔离丢弃
|
||||||
|
if command -v systemd-run >/dev/null 2>&1; then
|
||||||
|
systemd-run --quiet --no-block /bin/bash -c "export SILENT_MASTER_OTA='true'; export OTA_CHAT_ID='$CHAT_ID'; bash /tmp/install_master.sh"
|
||||||
|
else
|
||||||
|
export SILENT_MASTER_OTA="true"
|
||||||
|
export OTA_CHAT_ID="$CHAT_ID"
|
||||||
|
nohup bash /tmp/install_master.sh >/dev/null 2>&1 & disown
|
||||||
|
fi
|
||||||
|
|
||||||
|
# 当前旧进程休眠并等待被幽灵进程处决
|
||||||
|
sleep 10
|
||||||
|
;;
|
||||||
|
|
||||||
"all_reports")
|
"all_reports")
|
||||||
NODE_DATA=$(db_exec "SELECT node_name, agent_ip, agent_port FROM nodes WHERE chat_id='$CHAT_ID';")
|
NODE_DATA=$(db_exec "SELECT node_name, agent_ip, agent_port FROM nodes WHERE chat_id='$CHAT_ID';")
|
||||||
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
|
||||||
;;
|
;;
|
||||||
@@ -255,13 +386,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;")
|
||||||
@@ -271,16 +488,12 @@ 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"
|
||||||
BTNS="${BTNS%,}]"
|
# L1 追加返回中枢逃生舱
|
||||||
send_ui "$CHAT_ID" "🌍 **全视界战略雷达**\n请选择要检阅的战区:" "$BTNS"
|
BTNS="$BTNS[{\"text\":\"🏠 回到司令部\",\"callback_data\":\"/start\"}]]"
|
||||||
|
send_ui "$CHAT_ID" "🌍 **全视界战略雷达**\n已为您聚合当前舰队的部署大区,请选择要检阅的战区:" "$BTNS"
|
||||||
fi
|
fi
|
||||||
;;
|
;;
|
||||||
|
|
||||||
@@ -313,9 +526,9 @@ while true; do
|
|||||||
ROW_STR="${ROW_STR%,}]"
|
ROW_STR="${ROW_STR%,}]"
|
||||||
BTNS="$BTNS$ROW_STR,"
|
BTNS="$BTNS$ROW_STR,"
|
||||||
fi
|
fi
|
||||||
# 添加返回上级大区雷达的按钮
|
# L2 追加双重逃生舱
|
||||||
BTNS="$BTNS[{\"text\":\"⬅️ 返回全球战区分布\",\"callback_data\":\"list_nodes\"}]]"
|
BTNS="$BTNS[{\"text\":\"⬅️ 返回战区地图\",\"callback_data\":\"list_nodes\"}, {\"text\":\"🏠 回到司令部\",\"callback_data\":\"/start\"}]]"
|
||||||
send_ui "$CHAT_ID" "📍 **[$TARGET_REGION] 战区哨兵矩阵**\n请下达控制指令:" "$BTNS"
|
send_ui "$CHAT_ID" "📍 **[$TARGET_REGION] 战区哨兵矩阵**\n请锁定要执行战术动作的具体目标:" "$BTNS"
|
||||||
fi
|
fi
|
||||||
;;
|
;;
|
||||||
|
|
||||||
@@ -324,44 +537,43 @@ while true; do
|
|||||||
TARGET_ALIAS=$(db_exec "SELECT IFNULL(node_alias, node_name) FROM nodes WHERE chat_id='$CHAT_ID' AND node_name='$TARGET_NODE' LIMIT 1;")
|
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"
|
[ -z "$TARGET_ALIAS" ] && TARGET_ALIAS="$TARGET_NODE"
|
||||||
|
|
||||||
# [v3.5.3] 将改名收纳至 L5 高级面板,替换为“高级控制功能”
|
# 抓取节点全景元数据
|
||||||
BTNS="[[{\"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\"}], [{\"text\":\"⚙️ 高级控制功能\",\"callback_data\":\"adv:$TARGET_NODE\"}, {\"text\":\"🗑️ 剔除失联节点\",\"callback_data\":\"del:$TARGET_NODE\"}], [{\"text\":\"⬅️ 返回大区目录\",\"callback_data\":\"list_nodes\"}]]"
|
TOGGLE_INFO=$(db_exec "SELECT enable_google, enable_trust, enable_ota, agent_ip, IFNULL(last_seen, '未知') FROM nodes WHERE chat_id='$CHAT_ID' AND node_name='$TARGET_NODE' LIMIT 1;")
|
||||||
|
|
||||||
if [ -n "$MSG_ID" ]; then
|
|
||||||
edit_ui "$CHAT_ID" "$MSG_ID" "⚙️ **目标锁定**: \`$TARGET_ALIAS\`\n*(身份标识: $TARGET_NODE)*\n请选择战术动作:" "$BTNS"
|
|
||||||
else
|
|
||||||
send_ui "$CHAT_ID" "⚙️ **目标锁定**: \`$TARGET_ALIAS\`\n*(身份标识: $TARGET_NODE)*\n请选择战术动作:" "$BTNS"
|
|
||||||
fi
|
|
||||||
;;
|
|
||||||
|
|
||||||
adv:*)
|
|
||||||
# [L5 高级控制面板渲染]
|
|
||||||
TARGET_NODE=$(echo "${TEXT#*:}" | tr -cd 'a-zA-Z0-9_.-')
|
|
||||||
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"
|
|
||||||
|
|
||||||
# 抓取当前节点的开关状态 (追加 enable_ota)
|
|
||||||
TOGGLE_INFO=$(db_exec "SELECT enable_google, enable_trust, enable_ota FROM nodes WHERE chat_id='$CHAT_ID' AND node_name='$TARGET_NODE' LIMIT 1;")
|
|
||||||
ST_GOOGLE=$(echo "$TOGGLE_INFO" | cut -d'|' -f1)
|
ST_GOOGLE=$(echo "$TOGGLE_INFO" | cut -d'|' -f1)
|
||||||
ST_TRUST=$(echo "$TOGGLE_INFO" | cut -d'|' -f2)
|
ST_TRUST=$(echo "$TOGGLE_INFO" | cut -d'|' -f2)
|
||||||
ST_OTA=$(echo "$TOGGLE_INFO" | cut -d'|' -f3)
|
ST_OTA=$(echo "$TOGGLE_INFO" | cut -d'|' -f3)
|
||||||
|
A_IP=$(echo "$TOGGLE_INFO" | cut -d'|' -f4)
|
||||||
|
LAST_SEEN=$(echo "$TOGGLE_INFO" | cut -d'|' -f5)
|
||||||
|
|
||||||
# 动态渲染状态机红绿灯 UI
|
# 动态渲染状态文字
|
||||||
[ "$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"; }
|
||||||
|
|
||||||
# [v3.6.0 核心] 官方网关单节点 UI 熔断 + 本地开关双重校验
|
# 模块一:即时战术动作 (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\"}]"
|
||||||
|
|
||||||
|
# 模块三:深度配置管理 (结合 UI 熔断)
|
||||||
if [ "$IS_OFFICIAL_GATEWAY" != "true" ] && [ "$ST_OTA" == "true" ]; then
|
if [ "$IS_OFFICIAL_GATEWAY" != "true" ] && [ "$ST_OTA" == "true" ]; then
|
||||||
BTN_OTA="{\"text\":\"🆙 远程升级客户端\",\"callback_data\":\"ota_confirm:$TARGET_NODE\"}"
|
BTN_CONFIG="[{\"text\":\"✏️ 更改终端展示代号\",\"callback_data\":\"rename:$TARGET_NODE\"}, {\"text\":\"🆙 OTA 静默升级\",\"callback_data\":\"ota_confirm:$TARGET_NODE\"}]"
|
||||||
BTNS="[[{\"text\":\"$BTN_G\",\"callback_data\":\"toggle:google:$TARGET_NODE:$ACT_G\"}], [{\"text\":\"$BTN_T\",\"callback_data\":\"toggle:trust:$TARGET_NODE:$ACT_T\"}], [{\"text\":\"✏️ 修改节点备注\",\"callback_data\":\"rename:$TARGET_NODE\"}, $BTN_OTA], [{\"text\":\"⬅️ 返回节点面板\",\"callback_data\":\"manage:$TARGET_NODE\"}]]"
|
|
||||||
else
|
else
|
||||||
BTNS="[[{\"text\":\"$BTN_G\",\"callback_data\":\"toggle:google:$TARGET_NODE:$ACT_G\"}], [{\"text\":\"$BTN_T\",\"callback_data\":\"toggle:trust:$TARGET_NODE:$ACT_T\"}], [{\"text\":\"✏️ 修改节点备注\",\"callback_data\":\"rename:$TARGET_NODE\"}], [{\"text\":\"⬅️ 返回节点面板\",\"callback_data\":\"manage:$TARGET_NODE\"}]]"
|
BTN_CONFIG="[{\"text\":\"✏️ 更改终端展示代号\",\"callback_data\":\"rename:$TARGET_NODE\"}]"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# 模块四:危险区与逃生舱
|
||||||
|
BTN_DANGER="[{\"text\":\"🗑️ 从中枢销毁该档案\",\"callback_data\":\"del:$TARGET_NODE\"}, {\"text\":\"⬅️ 返回战区列表\",\"callback_data\":\"list_nodes\"}]"
|
||||||
|
|
||||||
|
# 组合终极矩阵
|
||||||
|
BTNS="[$BTN_ACTION, $BTN_TOGGLE, $BTN_CONFIG, $BTN_DANGER]"
|
||||||
|
|
||||||
|
TEXT_MSG="⚙️ **目标锁定**: \`$TARGET_ALIAS\`\n(底层标识: \`$TARGET_NODE\`)\n🌐 IP 坐标: \`$A_IP\`\n🕒 最后通讯: \`$LAST_SEEN\`\n\n请下达精确控制指令:"
|
||||||
|
|
||||||
if [ -n "$MSG_ID" ]; then
|
if [ -n "$MSG_ID" ]; then
|
||||||
edit_ui "$CHAT_ID" "$MSG_ID" "⚙️ **高级控制** | \`$TARGET_ALIAS\`\n请下达控制指令:" "$BTNS"
|
edit_ui "$CHAT_ID" "$MSG_ID" "$TEXT_MSG" "$BTNS"
|
||||||
else
|
else
|
||||||
send_ui "$CHAT_ID" "⚙️ **高级控制** | \`$TARGET_ALIAS\`\n请下达控制指令:" "$BTNS"
|
send_ui "$CHAT_ID" "$TEXT_MSG" "$BTNS"
|
||||||
fi
|
fi
|
||||||
;;
|
;;
|
||||||
|
|
||||||
@@ -378,7 +590,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';"
|
||||||
@@ -389,12 +602,35 @@ 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"; }
|
||||||
|
|
||||||
BTNS="[[{\"text\":\"$BTN_G\",\"callback_data\":\"toggle:google:$TARGET_NODE:$ACT_G\"}], [{\"text\":\"$BTN_T\",\"callback_data\":\"toggle:trust:$TARGET_NODE:$ACT_T\"}], [{\"text\":\"✏️ 修改节点备注\",\"callback_data\":\"rename:$TARGET_NODE\"}], [{\"text\":\"⬅️ 返回节点面板\",\"callback_data\":\"manage:$TARGET_NODE\"}]]"
|
# 切换后直接复用扁平化 L3 面板的重绘逻辑
|
||||||
|
TOGGLE_INFO=$(db_exec "SELECT enable_google, enable_trust, enable_ota, agent_ip, IFNULL(last_seen, '未知') FROM nodes WHERE chat_id='$CHAT_ID' AND node_name='$TARGET_NODE' LIMIT 1;")
|
||||||
|
ST_GOOGLE=$(echo "$TOGGLE_INFO" | cut -d'|' -f1)
|
||||||
|
ST_TRUST=$(echo "$TOGGLE_INFO" | cut -d'|' -f2)
|
||||||
|
ST_OTA=$(echo "$TOGGLE_INFO" | cut -d'|' -f3)
|
||||||
|
A_IP=$(echo "$TOGGLE_INFO" | cut -d'|' -f4)
|
||||||
|
LAST_SEEN=$(echo "$TOGGLE_INFO" | cut -d'|' -f5)
|
||||||
|
|
||||||
|
[ "$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"; }
|
||||||
|
|
||||||
|
# 模块一:即时战术动作 (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\"}]"
|
||||||
|
|
||||||
|
if [ "$IS_OFFICIAL_GATEWAY" != "true" ] && [ "$ST_OTA" == "true" ]; then
|
||||||
|
BTN_CONFIG="[{\"text\":\"✏️ 更改终端展示代号\",\"callback_data\":\"rename:$TARGET_NODE\"}, {\"text\":\"🆙 OTA 静默升级\",\"callback_data\":\"ota_confirm:$TARGET_NODE\"}]"
|
||||||
|
else
|
||||||
|
BTN_CONFIG="[{\"text\":\"✏️ 更改终端展示代号\",\"callback_data\":\"rename:$TARGET_NODE\"}]"
|
||||||
|
fi
|
||||||
|
BTN_DANGER="[{\"text\":\"🗑️ 从中枢销毁该档案\",\"callback_data\":\"del:$TARGET_NODE\"}, {\"text\":\"⬅️ 返回战区列表\",\"callback_data\":\"list_nodes\"}]"
|
||||||
|
|
||||||
|
BTNS="[$BTN_ACTION, $BTN_TOGGLE, $BTN_CONFIG, $BTN_DANGER]"
|
||||||
TARGET_ALIAS=$(db_exec "SELECT IFNULL(node_alias, node_name) FROM nodes WHERE chat_id='$CHAT_ID' AND node_name='$TARGET_NODE' LIMIT 1;")
|
TARGET_ALIAS=$(db_exec "SELECT IFNULL(node_alias, node_name) FROM nodes WHERE chat_id='$CHAT_ID' AND node_name='$TARGET_NODE' LIMIT 1;")
|
||||||
|
|
||||||
edit_ui "$CHAT_ID" "$MSG_ID" "⚙️ **高级控制** | \`$TARGET_ALIAS\`\n✅ 成功:模块 [$MOD_NAME] 状态已切换为 $TARGET_STATE!" "$BTNS"
|
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"
|
||||||
else
|
else
|
||||||
send_msg "$CHAT_ID" "❌ 指令下发失败,节点可能离线或未更新至 v3.5.3。"
|
send_msg "$CHAT_ID" "❌ 指令下发失败,安全策略禁止降级重试。"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
;;
|
;;
|
||||||
@@ -404,8 +640,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;")
|
||||||
@@ -415,11 +662,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="🇫🇷" ;;
|
|
||||||
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%,}]"
|
||||||
@@ -454,10 +697,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';"
|
||||||
@@ -473,7 +716,8 @@ while true; do
|
|||||||
|
|
||||||
ota_confirm:*)
|
ota_confirm:*)
|
||||||
TARGET_NODE=$(echo "${TEXT#*:}" | tr -cd 'a-zA-Z0-9_.-')
|
TARGET_NODE=$(echo "${TEXT#*:}" | tr -cd 'a-zA-Z0-9_.-')
|
||||||
CONFIRM_BTNS="[[{\"text\":\"🚨 确认执行远程升级\",\"callback_data\":\"ota_execute:$TARGET_NODE\"}], [{\"text\":\"取消\",\"callback_data\":\"adv:$TARGET_NODE\"}]]"
|
# 将取消动作引导回 manage,因为 adv 已经被删除了
|
||||||
|
CONFIRM_BTNS="[[{\"text\":\"🚨 确认执行远程升级\",\"callback_data\":\"ota_execute:$TARGET_NODE\"}], [{\"text\":\"取消\",\"callback_data\":\"manage:$TARGET_NODE\"}]]"
|
||||||
send_ui "$CHAT_ID" "☢️ **操作确认**:即将向 \`$TARGET_NODE\` 下发 OTA 热更新指令。\n节点更新完成后会自动发送包含新版本号的注册回执,确定执行?" "$CONFIRM_BTNS"
|
send_ui "$CHAT_ID" "☢️ **操作确认**:即将向 \`$TARGET_NODE\` 下发 OTA 热更新指令。\n节点更新完成后会自动发送包含新版本号的注册回执,确定执行?" "$CONFIRM_BTNS"
|
||||||
;;
|
;;
|
||||||
|
|
||||||
@@ -493,14 +737,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
|
||||||
@@ -513,10 +765,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-')
|
||||||
|
|
||||||
@@ -534,11 +786,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
|
||||||
@@ -546,6 +798,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
|
||||||
@@ -563,6 +817,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
|
||||||
|
|||||||
@@ -5,6 +5,15 @@
|
|||||||
# 核心功能: 终止调度进程、清理看门狗定时任务、抹除数据库与配置
|
# 核心功能: 终止调度进程、清理看门狗定时任务、抹除数据库与配置
|
||||||
# ==========================================================
|
# ==========================================================
|
||||||
|
|
||||||
|
# ==========================================================
|
||||||
|
# 🛑 核心权限防线: 检查是否以 root 权限运行
|
||||||
|
# ==========================================================
|
||||||
|
if [ "$EUID" -ne 0 ]; then
|
||||||
|
echo -e "\033[31m❌ 权限被拒绝: 卸载 IP-Sentinel 需要最高系统权限。\033[0m"
|
||||||
|
echo -e "💡 请切换到 root 用户 (执行 su root 或 sudo -i) 后重新运行指令。"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
MASTER_DIR="/opt/ip_sentinel_master"
|
MASTER_DIR="/opt/ip_sentinel_master"
|
||||||
CONF_FILE="${MASTER_DIR}/master.conf"
|
CONF_FILE="${MASTER_DIR}/master.conf"
|
||||||
|
|
||||||
@@ -25,19 +34,30 @@ if [[ ! "$CONFIRM_DEL" =~ ^[Yy]$ ]]; then
|
|||||||
exit 0
|
exit 0
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# 1. 停止运行中的 Master 守护进程
|
# 1. 停止并删除 Systemd 服务 (适配新架构)
|
||||||
echo "[1/3] 正在终止后台中枢调度进程..."
|
echo "[1/4] 正在停止并删除 Systemd 服务..."
|
||||||
# [优化] 使用 pkill 替代 pgrep | xargs,指令更短、容错率更高
|
if command -v systemctl >/dev/null 2>&1; then
|
||||||
|
echo "💡 检测到 Systemd 环境,正在抹除 Systemd 服务单元..."
|
||||||
|
systemctl disable --now ip-sentinel-master.service >/dev/null 2>&1
|
||||||
|
rm -f /etc/systemd/system/ip-sentinel-master.service
|
||||||
|
systemctl daemon-reload
|
||||||
|
systemctl reset-failed
|
||||||
|
else
|
||||||
|
echo "💡 未检测到 Systemd,跳过此步骤..."
|
||||||
|
fi
|
||||||
|
|
||||||
|
# 2. 停止运行中的 Master 守护进程 (兜底清理老版进程)
|
||||||
|
echo "[2/4] 正在终止后台中枢调度进程..."
|
||||||
pkill -9 -f "tg_master.sh" >/dev/null 2>&1 || true
|
pkill -9 -f "tg_master.sh" >/dev/null 2>&1 || true
|
||||||
|
|
||||||
# 2. 清除看门狗定时任务 (Cron)
|
# 3. 清除看门狗定时任务 (Cron)
|
||||||
echo "[2/3] 正在清理系统定时任务 (Cron)..."
|
echo "[3/4] 正在清理系统定时任务 (Cron)..."
|
||||||
crontab -l 2>/dev/null | grep -v "tg_master.sh" > /tmp/cron_backup
|
crontab -l 2>/dev/null | grep -v "tg_master.sh" > /tmp/cron_backup
|
||||||
crontab /tmp/cron_backup
|
crontab /tmp/cron_backup
|
||||||
rm -f /tmp/cron_backup
|
rm -f /tmp/cron_backup
|
||||||
|
|
||||||
# 3. 删除所有文件、配置与数据库
|
# 4. 删除所有文件、配置与数据库
|
||||||
echo "[3/3] 正在抹除核心程序、配置文件与 SQLite 数据库..."
|
echo "[4/4] 正在抹除核心程序、配置文件与 SQLite 数据库..."
|
||||||
if [ -d "$MASTER_DIR" ]; then
|
if [ -d "$MASTER_DIR" ]; then
|
||||||
rm -rf "$MASTER_DIR"
|
rm -rf "$MASTER_DIR"
|
||||||
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 @@
|
|||||||
AGENT_VERSION=3.6.0
|
MASTER_VERSION=4.0.5
|
||||||
MASTER_VERSION=3.6.0
|
AGENT_VERSION=4.0.5
|
||||||
|
|||||||
Reference in New Issue
Block a user