From a59f65576918f5a134766fd171808fd1708d6ce4 Mon Sep 17 00:00:00 2001 From: Alex Yang Date: Mon, 24 Nov 2025 13:26:01 +0800 Subject: [PATCH] =?UTF-8?q?web=E5=BC=82=E5=B8=B8=E5=BE=85=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D:=E5=B1=8F=E8=94=BD=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data/hosts.txt | 3 +- data/shield_stats.json | 2 +- data/stats.json | 2 +- dns-server.log | 198 +++++++++++++++++++++++++++++++++ static/index.html | 51 +++++++++ static/js/modules/dashboard.js | 197 ++++++++++++++++++++++++++++---- 6 files changed, 430 insertions(+), 23 deletions(-) diff --git a/data/hosts.txt b/data/hosts.txt index ab39ac2..5ee3edb 100644 --- a/data/hosts.txt +++ b/data/hosts.txt @@ -1,5 +1,4 @@ # DNS Server Hosts File # Generated by DNS Server -127.0.0.1 ex -::1 localhost +::1 localhost \ No newline at end of file diff --git a/data/shield_stats.json b/data/shield_stats.json index 80415f2..6e36cd0 100644 --- a/data/shield_stats.json +++ b/data/shield_stats.json @@ -1,5 +1,5 @@ { "blockedDomainsCount": {}, "resolvedDomainsCount": {}, - "lastSaved": "2025-11-24T13:07:28.142017754+08:00" + "lastSaved": "2025-11-24T13:25:18.310593363+08:00" } \ No newline at end of file diff --git a/data/stats.json b/data/stats.json index 1f50a94..d935c61 100644 --- a/data/stats.json +++ b/data/stats.json @@ -2868,5 +2868,5 @@ "2025-11-24-11": 188, "2025-11-24-12": 18 }, - "lastSaved": "2025-11-24T13:00:55.919436607+08:00" + "lastSaved": "2025-11-24T13:22:16.660203344+08:00" } \ No newline at end of file diff --git a/dns-server.log b/dns-server.log index 3533188..3619bc4 100644 --- a/dns-server.log +++ b/dns-server.log @@ -48220,3 +48220,201 @@ time="2025-11-24T13:07:28+08:00" level=info msg="Shield计数数据保存成功" time="2025-11-24T13:07:28+08:00" level=error msg="获取远程规则失败" error="Get \"hhttps://gitea.amazehome.xyz/AMAZEHOME/hosts-and-Filters/raw/branch/main/list/easylist.txt\": unsupported protocol scheme \"hhttps\"" url="hhttps://gitea.amazehome.xyz/AMAZEHOME/hosts-and-Filters/raw/branch/main/list/easylist.txt" time="2025-11-24T13:07:28+08:00" level=info msg="规则加载完成，域名规则: 86449, 排除规则: 977, 正则规则: 452, hosts规则: 2" time="2025-11-24T13:07:28+08:00" level=info msg="自动更新规则成功" +time="2025-11-24T13:08:28+08:00" level=info msg="开始自动更新规则" +time="2025-11-24T13:08:28+08:00" level=info msg="从缓存加载远程规则" url="https://gitea.amazehome.xyz/AMAZEHOME/hosts-and-filters/raw/branch/main/filter.txt" +time="2025-11-24T13:08:28+08:00" level=error msg="获取远程规则失败" error="Get \"hhttps://gitea.amazehome.xyz/AMAZEHOME/hosts-and-Filters/raw/branch/main/list/easylist.txt\": unsupported protocol scheme \"hhttps\"" url="hhttps://gitea.amazehome.xyz/AMAZEHOME/hosts-and-Filters/raw/branch/main/list/easylist.txt" +time="2025-11-24T13:08:28+08:00" level=info msg="规则加载完成，域名规则: 86449, 排除规则: 977, 正则规则: 457, hosts规则: 2" +time="2025-11-24T13:08:28+08:00" level=info msg="自动更新规则成功" +time="2025-11-24T13:08:28+08:00" level=info msg="Shield计数数据保存成功" +time="2025-11-24T13:09:33+08:00" level=info msg="Shield计数数据加载成功" +time="2025-11-24T13:09:33+08:00" level=error msg="获取远程规则失败" error="Get \"hhttps://gitea.amazehome.xyz/AMAZEHOME/hosts-and-Filters/raw/branch/main/list/easylist.txt\": unsupported protocol scheme \"hhttps\"" url="hhttps://gitea.amazehome.xyz/AMAZEHOME/hosts-and-Filters/raw/branch/main/list/easylist.txt" +time="2025-11-24T13:09:34+08:00" level=info msg="规则加载完成，域名规则: 86449, 排除规则: 977, 正则规则: 452, hosts规则: 2" +time="2025-11-24T13:09:34+08:00" level=info msg="统计数据加载成功" +time="2025-11-24T13:09:34+08:00" level=info msg="DNS服务器已启动，监听端口: 53" +time="2025-11-24T13:09:34+08:00" level=info msg="HTTP控制台已启动，监听端口: 8080" +time="2025-11-24T13:09:34+08:00" level=info msg="DNS TCP服务器启动，监听端口: 53" +time="2025-11-24T13:09:34+08:00" level=info msg="启动Shield计数数据自动保存功能" file=./data/shield_stats.json interval=60 +time="2025-11-24T13:09:34+08:00" level=info msg="HTTP控制台服务器启动，监听地址: 0.0.0.0:8080" +time="2025-11-24T13:09:34+08:00" level=info msg="DNS UDP服务器启动，监听端口: 53" +time="2025-11-24T13:09:34+08:00" level=info msg="规则自动更新已启动" interval=60 +time="2025-11-24T13:09:34+08:00" level=info msg="Shield计数数据保存成功" +time="2025-11-24T13:10:34+08:00" level=info msg="开始自动更新规则" +time="2025-11-24T13:10:34+08:00" level=info msg="Shield计数数据保存成功" +time="2025-11-24T13:10:34+08:00" level=error msg="获取远程规则失败" error="Get \"hhttps://gitea.amazehome.xyz/AMAZEHOME/hosts-and-Filters/raw/branch/main/list/easylist.txt\": unsupported protocol scheme \"hhttps\"" url="hhttps://gitea.amazehome.xyz/AMAZEHOME/hosts-and-Filters/raw/branch/main/list/easylist.txt" +time="2025-11-24T13:10:34+08:00" level=info msg="规则加载完成，域名规则: 86449, 排除规则: 977, 正则规则: 452, hosts规则: 2" +time="2025-11-24T13:10:34+08:00" level=info msg="自动更新规则成功" +time="2025-11-24T13:11:17+08:00" level=debug msg="接收到DNS查询" client="10.35.10.11:62947" domain=apd-pcdnwxstat.teg.tencent-cloud.net type=1 +time="2025-11-24T13:11:17+08:00" level=debug msg="DNS查询成功" domain=apd-pcdnwxstat.teg.tencent-cloud.net rtt=7.139609ms server="223.5.5.5:53" +time="2025-11-24T13:11:34+08:00" level=info msg="开始自动更新规则" +time="2025-11-24T13:11:34+08:00" level=info msg="Shield计数数据保存成功" +time="2025-11-24T13:11:34+08:00" level=info msg="从缓存加载远程规则" url="https://gitea.amazehome.xyz/AMAZEHOME/hosts-and-filters/raw/branch/main/filter.txt" +time="2025-11-24T13:11:34+08:00" level=info msg="从缓存加载远程规则" url="https://gitea.amazehome.xyz/AMAZEHOME/hosts-and-Filters/raw/branch/main/hosts/adaway.txt" +time="2025-11-24T13:11:34+08:00" level=error msg="获取远程规则失败" error="Get \"hhttps://gitea.amazehome.xyz/AMAZEHOME/hosts-and-Filters/raw/branch/main/list/easylist.txt\": unsupported protocol scheme \"hhttps\"" url="hhttps://gitea.amazehome.xyz/AMAZEHOME/hosts-and-Filters/raw/branch/main/list/easylist.txt" +time="2025-11-24T13:11:34+08:00" level=info msg="从缓存加载远程规则" url="https://gitea.amazehome.xyz/AMAZEHOME/hosts-and-filters/raw/branch/main/rules/costomize.txt" +time="2025-11-24T13:11:34+08:00" level=info msg="规则加载完成，域名规则: 86449, 排除规则: 977, 正则规则: 901, hosts规则: 2" +time="2025-11-24T13:11:34+08:00" level=info msg="自动更新规则成功" +time="2025-11-24T13:12:34+08:00" level=info msg="开始自动更新规则" +time="2025-11-24T13:12:34+08:00" level=info msg="Shield计数数据保存成功" +time="2025-11-24T13:12:34+08:00" level=info msg="从缓存加载远程规则" url="https://gitea.amazehome.xyz/AMAZEHOME/hosts-and-filters/raw/branch/main/filter.txt" +time="2025-11-24T13:12:34+08:00" level=info msg="从缓存加载远程规则" url="https://gitea.amazehome.xyz/AMAZEHOME/hosts-and-Filters/raw/branch/main/hosts/adaway.txt" +time="2025-11-24T13:12:34+08:00" level=error msg="获取远程规则失败" error="Get \"hhttps://gitea.amazehome.xyz/AMAZEHOME/hosts-and-Filters/raw/branch/main/list/easylist.txt\": unsupported protocol scheme \"hhttps\"" url="hhttps://gitea.amazehome.xyz/AMAZEHOME/hosts-and-Filters/raw/branch/main/list/easylist.txt" +time="2025-11-24T13:12:34+08:00" level=info msg="从缓存加载远程规则" url="https://gitea.amazehome.xyz/AMAZEHOME/hosts-and-filters/raw/branch/main/rules/costomize.txt" +time="2025-11-24T13:12:34+08:00" level=info msg="规则加载完成，域名规则: 86449, 排除规则: 977, 正则规则: 901, hosts规则: 2" +time="2025-11-24T13:12:34+08:00" level=info msg="自动更新规则成功" +time="2025-11-24T13:12:53+08:00" level=debug msg="接收到DNS查询" client="10.35.10.11:21388" domain=grs.dbankcloud.com type=1 +time="2025-11-24T13:12:53+08:00" level=debug msg="DNS查询成功" domain=grs.dbankcloud.com rtt=6.43498ms server="223.5.5.5:53" +time="2025-11-24T13:12:53+08:00" level=debug msg="接收到DNS查询" client="10.35.10.11:12023" domain=events-drcn.op.dbankcloud.cn type=1 +time="2025-11-24T13:12:53+08:00" level=info msg="域名被屏蔽" client="10.35.10.11:12023" domain=events-drcn.op.dbankcloud.cn +time="2025-11-24T13:12:54+08:00" level=debug msg="接收到DNS查询" client="10.35.10.11:12023" domain=events-drcn.op.dbankcloud.cn type=1 +time="2025-11-24T13:12:54+08:00" level=info msg="域名被屏蔽" client="10.35.10.11:12023" domain=events-drcn.op.dbankcloud.cn +time="2025-11-24T13:13:34+08:00" level=info msg="开始自动更新规则" +time="2025-11-24T13:13:34+08:00" level=info msg="Shield计数数据保存成功" +time="2025-11-24T13:13:34+08:00" level=info msg="从缓存加载远程规则" url="https://gitea.amazehome.xyz/AMAZEHOME/hosts-and-filters/raw/branch/main/filter.txt" +time="2025-11-24T13:13:34+08:00" level=info msg="从缓存加载远程规则" url="https://gitea.amazehome.xyz/AMAZEHOME/hosts-and-Filters/raw/branch/main/hosts/adaway.txt" +time="2025-11-24T13:13:34+08:00" level=error msg="获取远程规则失败" error="Get \"hhttps://gitea.amazehome.xyz/AMAZEHOME/hosts-and-Filters/raw/branch/main/list/easylist.txt\": unsupported protocol scheme \"hhttps\"" url="hhttps://gitea.amazehome.xyz/AMAZEHOME/hosts-and-Filters/raw/branch/main/list/easylist.txt" +time="2025-11-24T13:13:34+08:00" level=info msg="从缓存加载远程规则" url="https://gitea.amazehome.xyz/AMAZEHOME/hosts-and-filters/raw/branch/main/rules/costomize.txt" +time="2025-11-24T13:13:34+08:00" level=info msg="规则加载完成，域名规则: 86449, 排除规则: 977, 正则规则: 901, hosts规则: 2" +time="2025-11-24T13:13:34+08:00" level=info msg="自动更新规则成功" +time="2025-11-24T13:14:34+08:00" level=info msg="开始自动更新规则" +time="2025-11-24T13:14:34+08:00" level=info msg="Shield计数数据保存成功" +time="2025-11-24T13:14:34+08:00" level=info msg="从缓存加载远程规则" url="https://gitea.amazehome.xyz/AMAZEHOME/hosts-and-filters/raw/branch/main/filter.txt" +time="2025-11-24T13:14:34+08:00" level=info msg="从缓存加载远程规则" url="https://gitea.amazehome.xyz/AMAZEHOME/hosts-and-Filters/raw/branch/main/hosts/adaway.txt" +time="2025-11-24T13:14:34+08:00" level=error msg="获取远程规则失败" error="Get \"hhttps://gitea.amazehome.xyz/AMAZEHOME/hosts-and-Filters/raw/branch/main/list/easylist.txt\": unsupported protocol scheme \"hhttps\"" url="hhttps://gitea.amazehome.xyz/AMAZEHOME/hosts-and-Filters/raw/branch/main/list/easylist.txt" +time="2025-11-24T13:14:34+08:00" level=info msg="规则加载完成，域名规则: 86449, 排除规则: 977, 正则规则: 457, hosts规则: 2" +time="2025-11-24T13:14:34+08:00" level=info msg="自动更新规则成功" +time="2025-11-24T13:15:34+08:00" level=info msg="开始自动更新规则" +time="2025-11-24T13:15:34+08:00" level=info msg="Shield计数数据保存成功" +time="2025-11-24T13:15:34+08:00" level=info msg="从缓存加载远程规则" url="https://gitea.amazehome.xyz/AMAZEHOME/hosts-and-filters/raw/branch/main/filter.txt" +time="2025-11-24T13:15:34+08:00" level=info msg="从缓存加载远程规则" url="https://gitea.amazehome.xyz/AMAZEHOME/hosts-and-Filters/raw/branch/main/hosts/adaway.txt" +time="2025-11-24T13:15:34+08:00" level=error msg="获取远程规则失败" error="Get \"hhttps://gitea.amazehome.xyz/AMAZEHOME/hosts-and-Filters/raw/branch/main/list/easylist.txt\": unsupported protocol scheme \"hhttps\"" url="hhttps://gitea.amazehome.xyz/AMAZEHOME/hosts-and-Filters/raw/branch/main/list/easylist.txt" +time="2025-11-24T13:15:34+08:00" level=info msg="从缓存加载远程规则" url="https://gitea.amazehome.xyz/AMAZEHOME/hosts-and-filters/raw/branch/main/rules/costomize.txt" +time="2025-11-24T13:15:34+08:00" level=info msg="规则加载完成，域名规则: 86449, 排除规则: 977, 正则规则: 901, hosts规则: 2" +time="2025-11-24T13:15:34+08:00" level=info msg="自动更新规则成功" +time="2025-11-24T13:16:34+08:00" level=info msg="开始自动更新规则" +time="2025-11-24T13:16:34+08:00" level=info msg="Shield计数数据保存成功" +time="2025-11-24T13:16:34+08:00" level=info msg="从缓存加载远程规则" url="https://gitea.amazehome.xyz/AMAZEHOME/hosts-and-filters/raw/branch/main/filter.txt" +time="2025-11-24T13:16:34+08:00" level=info msg="从缓存加载远程规则" url="https://gitea.amazehome.xyz/AMAZEHOME/hosts-and-Filters/raw/branch/main/hosts/adaway.txt" +time="2025-11-24T13:16:34+08:00" level=error msg="获取远程规则失败" error="Get \"hhttps://gitea.amazehome.xyz/AMAZEHOME/hosts-and-Filters/raw/branch/main/list/easylist.txt\": unsupported protocol scheme \"hhttps\"" url="hhttps://gitea.amazehome.xyz/AMAZEHOME/hosts-and-Filters/raw/branch/main/list/easylist.txt" +time="2025-11-24T13:16:34+08:00" level=info msg="从缓存加载远程规则" url="https://gitea.amazehome.xyz/AMAZEHOME/hosts-and-filters/raw/branch/main/rules/costomize.txt" +time="2025-11-24T13:16:34+08:00" level=info msg="规则加载完成，域名规则: 86449, 排除规则: 977, 正则规则: 901, hosts规则: 2" +time="2025-11-24T13:16:34+08:00" level=info msg="自动更新规则成功" +time="2025-11-24T13:17:34+08:00" level=info msg="开始自动更新规则" +time="2025-11-24T13:17:34+08:00" level=info msg="Shield计数数据保存成功" +time="2025-11-24T13:17:34+08:00" level=info msg="从缓存加载远程规则" url="https://gitea.amazehome.xyz/AMAZEHOME/hosts-and-filters/raw/branch/main/filter.txt" +time="2025-11-24T13:17:34+08:00" level=info msg="从缓存加载远程规则" url="https://gitea.amazehome.xyz/AMAZEHOME/hosts-and-Filters/raw/branch/main/hosts/adaway.txt" +time="2025-11-24T13:17:34+08:00" level=error msg="获取远程规则失败" error="Get \"hhttps://gitea.amazehome.xyz/AMAZEHOME/hosts-and-Filters/raw/branch/main/list/easylist.txt\": unsupported protocol scheme \"hhttps\"" url="hhttps://gitea.amazehome.xyz/AMAZEHOME/hosts-and-Filters/raw/branch/main/list/easylist.txt" +time="2025-11-24T13:17:34+08:00" level=info msg="从缓存加载远程规则" url="https://gitea.amazehome.xyz/AMAZEHOME/hosts-and-filters/raw/branch/main/rules/costomize.txt" +time="2025-11-24T13:17:34+08:00" level=info msg="规则加载完成，域名规则: 86449, 排除规则: 977, 正则规则: 901, hosts规则: 2" +time="2025-11-24T13:17:34+08:00" level=info msg="自动更新规则成功" +time="2025-11-24T13:18:34+08:00" level=info msg="开始自动更新规则" +time="2025-11-24T13:18:34+08:00" level=info msg="Shield计数数据保存成功" +time="2025-11-24T13:18:34+08:00" level=info msg="从缓存加载远程规则" url="https://gitea.amazehome.xyz/AMAZEHOME/hosts-and-filters/raw/branch/main/filter.txt" +time="2025-11-24T13:18:34+08:00" level=info msg="从缓存加载远程规则" url="https://gitea.amazehome.xyz/AMAZEHOME/hosts-and-Filters/raw/branch/main/hosts/adaway.txt" +time="2025-11-24T13:18:34+08:00" level=error msg="获取远程规则失败" error="Get \"hhttps://gitea.amazehome.xyz/AMAZEHOME/hosts-and-Filters/raw/branch/main/list/easylist.txt\": unsupported protocol scheme \"hhttps\"" url="hhttps://gitea.amazehome.xyz/AMAZEHOME/hosts-and-Filters/raw/branch/main/list/easylist.txt" +time="2025-11-24T13:18:34+08:00" level=info msg="从缓存加载远程规则" url="https://gitea.amazehome.xyz/AMAZEHOME/hosts-and-filters/raw/branch/main/rules/costomize.txt" +time="2025-11-24T13:18:34+08:00" level=info msg="规则加载完成，域名规则: 86449, 排除规则: 977, 正则规则: 901, hosts规则: 2" +time="2025-11-24T13:18:34+08:00" level=info msg="自动更新规则成功" +time="2025-11-24T13:19:34+08:00" level=info msg="开始自动更新规则" +time="2025-11-24T13:19:34+08:00" level=info msg="Shield计数数据保存成功" +time="2025-11-24T13:19:34+08:00" level=info msg="从缓存加载远程规则" url="https://gitea.amazehome.xyz/AMAZEHOME/hosts-and-filters/raw/branch/main/filter.txt" +time="2025-11-24T13:19:34+08:00" level=info msg="从缓存加载远程规则" url="https://gitea.amazehome.xyz/AMAZEHOME/hosts-and-Filters/raw/branch/main/hosts/adaway.txt" +time="2025-11-24T13:19:34+08:00" level=error msg="获取远程规则失败" error="Get \"hhttps://gitea.amazehome.xyz/AMAZEHOME/hosts-and-Filters/raw/branch/main/list/easylist.txt\": unsupported protocol scheme \"hhttps\"" url="hhttps://gitea.amazehome.xyz/AMAZEHOME/hosts-and-Filters/raw/branch/main/list/easylist.txt" +time="2025-11-24T13:19:34+08:00" level=info msg="规则加载完成，域名规则: 86449, 排除规则: 977, 正则规则: 457, hosts规则: 1" +time="2025-11-24T13:19:34+08:00" level=info msg="自动更新规则成功" +time="2025-11-24T13:19:54+08:00" level=debug msg="接收到DNS查询" client="10.35.10.11:41752" domain=metrics1-drcn.dt.dbankcloud.cn type=1 +time="2025-11-24T13:19:54+08:00" level=info msg="域名被屏蔽" client="10.35.10.11:41752" domain=metrics1-drcn.dt.dbankcloud.cn +time="2025-11-24T13:19:54+08:00" level=debug msg="接收到DNS查询" client="10.35.10.11:40545" domain=event-drcn.push.dbankcloud.cn type=1 +time="2025-11-24T13:19:54+08:00" level=info msg="域名被屏蔽" client="10.35.10.11:40545" domain=event-drcn.push.dbankcloud.cn +time="2025-11-24T13:19:54+08:00" level=debug msg="接收到DNS查询" client="10.35.10.11:41752" domain=metrics1-drcn.dt.dbankcloud.cn type=1 +time="2025-11-24T13:19:54+08:00" level=info msg="域名被屏蔽" client="10.35.10.11:41752" domain=metrics1-drcn.dt.dbankcloud.cn +time="2025-11-24T13:19:54+08:00" level=debug msg="接收到DNS查询" client="10.35.10.11:40545" domain=event-drcn.push.dbankcloud.cn type=1 +time="2025-11-24T13:19:54+08:00" level=info msg="域名被屏蔽" client="10.35.10.11:40545" domain=event-drcn.push.dbankcloud.cn +time="2025-11-24T13:20:34+08:00" level=info msg="开始自动更新规则" +time="2025-11-24T13:20:34+08:00" level=info msg="Shield计数数据保存成功" +time="2025-11-24T13:20:34+08:00" level=info msg="从缓存加载远程规则" url="https://gitea.amazehome.xyz/AMAZEHOME/hosts-and-filters/raw/branch/main/filter.txt" +time="2025-11-24T13:20:34+08:00" level=info msg="从缓存加载远程规则" url="https://gitea.amazehome.xyz/AMAZEHOME/hosts-and-Filters/raw/branch/main/hosts/adaway.txt" +time="2025-11-24T13:20:34+08:00" level=error msg="获取远程规则失败" error="Get \"hhttps://gitea.amazehome.xyz/AMAZEHOME/hosts-and-Filters/raw/branch/main/list/easylist.txt\": unsupported protocol scheme \"hhttps\"" url="hhttps://gitea.amazehome.xyz/AMAZEHOME/hosts-and-Filters/raw/branch/main/list/easylist.txt" +time="2025-11-24T13:20:34+08:00" level=info msg="从缓存加载远程规则" url="https://gitea.amazehome.xyz/AMAZEHOME/hosts-and-filters/raw/branch/main/rules/costomize.txt" +time="2025-11-24T13:20:34+08:00" level=info msg="规则加载完成，域名规则: 86449, 排除规则: 977, 正则规则: 901, hosts规则: 1" +time="2025-11-24T13:20:34+08:00" level=info msg="自动更新规则成功" +time="2025-11-24T13:21:05+08:00" level=info msg="Shield计数数据加载成功" +time="2025-11-24T13:21:06+08:00" level=info msg="从缓存加载远程规则" url="https://gitea.amazehome.xyz/AMAZEHOME/hosts-and-filters/raw/branch/main/filter.txt" +time="2025-11-24T13:21:06+08:00" level=info msg="从缓存加载远程规则" url="https://gitea.amazehome.xyz/AMAZEHOME/hosts-and-Filters/raw/branch/main/hosts/adaway.txt" +time="2025-11-24T13:21:06+08:00" level=error msg="获取远程规则失败" error="Get \"hhttps://gitea.amazehome.xyz/AMAZEHOME/hosts-and-Filters/raw/branch/main/list/easylist.txt\": unsupported protocol scheme \"hhttps\"" url="hhttps://gitea.amazehome.xyz/AMAZEHOME/hosts-and-Filters/raw/branch/main/list/easylist.txt" +time="2025-11-24T13:21:06+08:00" level=info msg="从缓存加载远程规则" url="https://gitea.amazehome.xyz/AMAZEHOME/hosts-and-filters/raw/branch/main/rules/costomize.txt" +time="2025-11-24T13:21:06+08:00" level=info msg="规则加载完成，域名规则: 86449, 排除规则: 977, 正则规则: 901, hosts规则: 1" +time="2025-11-24T13:21:06+08:00" level=info msg="统计数据加载成功" +time="2025-11-24T13:21:06+08:00" level=info msg="DNS服务器已启动，监听端口: 53" +time="2025-11-24T13:21:06+08:00" level=info msg="HTTP控制台已启动，监听端口: 8080" +time="2025-11-24T13:21:06+08:00" level=info msg="规则自动更新已启动" interval=60 +time="2025-11-24T13:21:06+08:00" level=info msg="启动Shield计数数据自动保存功能" file=./data/shield_stats.json interval=60 +time="2025-11-24T13:21:06+08:00" level=info msg="HTTP控制台服务器启动，监听地址: 0.0.0.0:8080" +time="2025-11-24T13:21:06+08:00" level=info msg="Shield计数数据保存成功" +time="2025-11-24T13:21:06+08:00" level=info msg="DNS TCP服务器启动，监听端口: 53" +time="2025-11-24T13:21:06+08:00" level=info msg="DNS UDP服务器启动，监听端口: 53" +time="2025-11-24T13:21:06+08:00" level=error msg="DNS UDP服务器启动失败" error="listen udp :53: bind: address already in use" +time="2025-11-24T13:21:06+08:00" level=error msg="HTTP控制台服务器启动失败" error="listen tcp 0.0.0.0:8080: bind: address already in use" +time="2025-11-24T13:21:06+08:00" level=error msg="DNS TCP服务器启动失败" error="listen tcp :53: bind: address already in use" +time="2025-11-24T13:21:15+08:00" level=debug msg="接收到DNS查询" client="10.35.10.11:40572" domain=aeventlog.beacon.qq.com type=1 +time="2025-11-24T13:21:15+08:00" level=debug msg="DNS查询成功" domain=aeventlog.beacon.qq.com rtt=5.720729ms server="223.5.5.5:53" +time="2025-11-24T13:21:34+08:00" level=info msg="开始自动更新规则" +time="2025-11-24T13:21:34+08:00" level=info msg="Shield计数数据保存成功" +time="2025-11-24T13:21:34+08:00" level=info msg="从缓存加载远程规则" url="https://gitea.amazehome.xyz/AMAZEHOME/hosts-and-filters/raw/branch/main/filter.txt" +time="2025-11-24T13:21:34+08:00" level=info msg="从缓存加载远程规则" url="https://gitea.amazehome.xyz/AMAZEHOME/hosts-and-Filters/raw/branch/main/hosts/adaway.txt" +time="2025-11-24T13:21:34+08:00" level=error msg="获取远程规则失败" error="Get \"hhttps://gitea.amazehome.xyz/AMAZEHOME/hosts-and-Filters/raw/branch/main/list/easylist.txt\": unsupported protocol scheme \"hhttps\"" url="hhttps://gitea.amazehome.xyz/AMAZEHOME/hosts-and-Filters/raw/branch/main/list/easylist.txt" +time="2025-11-24T13:21:34+08:00" level=info msg="从缓存加载远程规则" url="https://gitea.amazehome.xyz/AMAZEHOME/hosts-and-filters/raw/branch/main/rules/costomize.txt" +time="2025-11-24T13:21:34+08:00" level=info msg="规则加载完成，域名规则: 86449, 排除规则: 977, 正则规则: 901, hosts规则: 1" +time="2025-11-24T13:21:34+08:00" level=info msg="自动更新规则成功" +time="2025-11-24T13:22:06+08:00" level=info msg="开始自动更新规则" +time="2025-11-24T13:22:06+08:00" level=info msg="Shield计数数据保存成功" +time="2025-11-24T13:22:06+08:00" level=info msg="从缓存加载远程规则" url="https://gitea.amazehome.xyz/AMAZEHOME/hosts-and-filters/raw/branch/main/filter.txt" +time="2025-11-24T13:22:07+08:00" level=info msg="从缓存加载远程规则" url="https://gitea.amazehome.xyz/AMAZEHOME/hosts-and-Filters/raw/branch/main/hosts/adaway.txt" +time="2025-11-24T13:22:07+08:00" level=error msg="获取远程规则失败" error="Get \"hhttps://gitea.amazehome.xyz/AMAZEHOME/hosts-and-Filters/raw/branch/main/list/easylist.txt\": unsupported protocol scheme \"hhttps\"" url="hhttps://gitea.amazehome.xyz/AMAZEHOME/hosts-and-Filters/raw/branch/main/list/easylist.txt" +time="2025-11-24T13:22:07+08:00" level=info msg="从缓存加载远程规则" url="https://gitea.amazehome.xyz/AMAZEHOME/hosts-and-filters/raw/branch/main/rules/costomize.txt" +time="2025-11-24T13:22:07+08:00" level=info msg="规则加载完成，域名规则: 86449, 排除规则: 977, 正则规则: 901, hosts规则: 1" +time="2025-11-24T13:22:07+08:00" level=info msg="自动更新规则成功" +time="2025-11-24T13:22:16+08:00" level=info msg="正在关闭服务..." +time="2025-11-24T13:22:16+08:00" level=info msg="统计数据保存成功" +time="2025-11-24T13:22:16+08:00" level=info msg="DNS服务器已停止" +time="2025-11-24T13:22:16+08:00" level=info msg="HTTP控制台服务器已停止" +time="2025-11-24T13:22:16+08:00" level=info msg="Shield计数数据保存成功" +time="2025-11-24T13:22:16+08:00" level=info msg="规则自动更新已停止" +time="2025-11-24T13:22:16+08:00" level=info msg="所有服务已关闭" +time="2025-11-24T13:22:16+08:00" level=warning msg="日志系统已关闭" +time="2025-11-24T13:22:17+08:00" level=info msg="Shield计数数据加载成功" +time="2025-11-24T13:22:17+08:00" level=info msg="从缓存加载远程规则" url="https://gitea.amazehome.xyz/AMAZEHOME/hosts-and-filters/raw/branch/main/filter.txt" +time="2025-11-24T13:22:18+08:00" level=info msg="从缓存加载远程规则" url="https://gitea.amazehome.xyz/AMAZEHOME/hosts-and-Filters/raw/branch/main/hosts/adaway.txt" +time="2025-11-24T13:22:18+08:00" level=error msg="获取远程规则失败" error="Get \"hhttps://gitea.amazehome.xyz/AMAZEHOME/hosts-and-Filters/raw/branch/main/list/easylist.txt\": unsupported protocol scheme \"hhttps\"" url="hhttps://gitea.amazehome.xyz/AMAZEHOME/hosts-and-Filters/raw/branch/main/list/easylist.txt" +time="2025-11-24T13:22:18+08:00" level=info msg="从缓存加载远程规则" url="https://gitea.amazehome.xyz/AMAZEHOME/hosts-and-filters/raw/branch/main/rules/costomize.txt" +time="2025-11-24T13:22:18+08:00" level=info msg="规则加载完成，域名规则: 86449, 排除规则: 977, 正则规则: 901, hosts规则: 1" +time="2025-11-24T13:22:18+08:00" level=info msg="统计数据加载成功" +time="2025-11-24T13:22:18+08:00" level=info msg="DNS服务器已启动，监听端口: 53" +time="2025-11-24T13:22:18+08:00" level=info msg="HTTP控制台已启动，监听端口: 8080" +time="2025-11-24T13:22:18+08:00" level=info msg="HTTP控制台服务器启动，监听地址: 0.0.0.0:8080" +time="2025-11-24T13:22:18+08:00" level=info msg="规则自动更新已启动" interval=60 +time="2025-11-24T13:22:18+08:00" level=info msg="启动Shield计数数据自动保存功能" file=./data/shield_stats.json interval=60 +time="2025-11-24T13:22:18+08:00" level=info msg="DNS TCP服务器启动，监听端口: 53" +time="2025-11-24T13:22:18+08:00" level=info msg="DNS UDP服务器启动，监听端口: 53" +time="2025-11-24T13:22:18+08:00" level=info msg="Shield计数数据保存成功" +time="2025-11-24T13:22:35+08:00" level=debug msg="接收到DNS查询" client="10.35.10.11:11645" domain=tvax1.sinaimg.cn type=1 +time="2025-11-24T13:22:36+08:00" level=debug msg="DNS查询成功" domain=tvax1.sinaimg.cn rtt=6.066912ms server="223.5.5.5:53" +time="2025-11-24T13:23:18+08:00" level=info msg="开始自动更新规则" +time="2025-11-24T13:23:18+08:00" level=info msg="Shield计数数据保存成功" +time="2025-11-24T13:23:18+08:00" level=error msg="获取远程规则失败" error="Get \"hhttps://gitea.amazehome.xyz/AMAZEHOME/hosts-and-Filters/raw/branch/main/list/easylist.txt\": unsupported protocol scheme \"hhttps\"" url="hhttps://gitea.amazehome.xyz/AMAZEHOME/hosts-and-Filters/raw/branch/main/list/easylist.txt" +time="2025-11-24T13:23:18+08:00" level=info msg="规则加载完成，域名规则: 86449, 排除规则: 977, 正则规则: 452, hosts规则: 1" +time="2025-11-24T13:23:18+08:00" level=info msg="自动更新规则成功" +time="2025-11-24T13:23:44+08:00" level=debug msg="接收到DNS查询" client="10.35.10.11:48030" domain=aeventlog.beacon.qq.com type=1 +time="2025-11-24T13:23:44+08:00" level=debug msg="DNS查询成功" domain=aeventlog.beacon.qq.com rtt=5.813374ms server="223.5.5.5:53" +time="2025-11-24T13:24:18+08:00" level=info msg="开始自动更新规则" +time="2025-11-24T13:24:18+08:00" level=info msg="Shield计数数据保存成功" +time="2025-11-24T13:24:18+08:00" level=info msg="从缓存加载远程规则" url="https://gitea.amazehome.xyz/AMAZEHOME/hosts-and-filters/raw/branch/main/filter.txt" +time="2025-11-24T13:24:18+08:00" level=error msg="获取远程规则失败" error="Get \"hhttps://gitea.amazehome.xyz/AMAZEHOME/hosts-and-Filters/raw/branch/main/list/easylist.txt\": unsupported protocol scheme \"hhttps\"" url="hhttps://gitea.amazehome.xyz/AMAZEHOME/hosts-and-Filters/raw/branch/main/list/easylist.txt" +time="2025-11-24T13:24:18+08:00" level=info msg="规则加载完成，域名规则: 86449, 排除规则: 977, 正则规则: 457, hosts规则: 1" +time="2025-11-24T13:24:18+08:00" level=info msg="自动更新规则成功" +time="2025-11-24T13:25:18+08:00" level=info msg="开始自动更新规则" +time="2025-11-24T13:25:18+08:00" level=info msg="Shield计数数据保存成功" +time="2025-11-24T13:25:18+08:00" level=info msg="从缓存加载远程规则" url="https://gitea.amazehome.xyz/AMAZEHOME/hosts-and-filters/raw/branch/main/filter.txt" +time="2025-11-24T13:25:18+08:00" level=info msg="从缓存加载远程规则" url="https://gitea.amazehome.xyz/AMAZEHOME/hosts-and-Filters/raw/branch/main/hosts/adaway.txt" +time="2025-11-24T13:25:18+08:00" level=error msg="获取远程规则失败" error="Get \"hhttps://gitea.amazehome.xyz/AMAZEHOME/hosts-and-Filters/raw/branch/main/list/easylist.txt\": unsupported protocol scheme \"hhttps\"" url="hhttps://gitea.amazehome.xyz/AMAZEHOME/hosts-and-Filters/raw/branch/main/list/easylist.txt" +time="2025-11-24T13:25:18+08:00" level=info msg="规则加载完成，域名规则: 86449, 排除规则: 977, 正则规则: 457, hosts规则: 1" +time="2025-11-24T13:25:18+08:00" level=info msg="自动更新规则成功" diff --git a/static/index.html b/static/index.html index 7be8d34..f4cc79c 100644 --- a/static/index.html +++ b/static/index.html @@ -64,6 +64,57 @@ opacity: 0; } + /* 优化的表格过渡动画 */ + .table-transition { + transition: all 0.3s ease; + } + + /* 表格行淡入动画 */ + .table-row-fade-in { + animation: fadeIn 0.3s ease-out; + } + + /* 表格行淡出动画 */ + .table-row-fade-out { + animation: fadeOut 0.3s ease-in; + opacity: 0; + } + + /* 表格行高亮效果 */ + .table-row-highlight { + background-color: rgba(75, 192, 192, 0.2) !important; + transition: background-color 0.3s ease; + animation: highlightPulse 1s ease; + } + + @keyframes highlightPulse { + 0% { + background-color: rgba(75, 192, 192, 0.2); + } + 50% { + background-color: rgba(75, 192, 192, 0.4); + } + 100% { + background-color: rgba(75, 192, 192, 0.0); + } + } + + /* 数字更新完成动画 */ + .number-update-complete { + animation: numberComplete 0.3s ease; + } + + @keyframes numberComplete { + 0% { + color: #2196F3; + font-weight: bold; + } + 100% { + color: inherit; + font-weight: inherit; + } + } + @keyframes fadeIn { from { opacity: 0; diff --git a/static/js/modules/dashboard.js b/static/js/modules/dashboard.js index 25505eb..e72dd07 100644 --- a/static/js/modules/dashboard.js +++ b/static/js/modules/dashboard.js @@ -1,3 +1,11 @@ +// 全局变量 +let domainDataCache = { + blocked: null, + resolved: null +}; +let domainUpdateTimer = null; +const DOMAIN_UPDATE_INTERVAL = 5000; // 域名排行更新间隔，设为5秒，比统计数据更新慢一些 + // 初始化仪表盘面板 function initDashboardPanel() { // 初始化小型图表 @@ -10,6 +18,8 @@ function initDashboardPanel() { if (typeof startRealTimeUpdate === 'function') { startRealTimeUpdate(); } + // 启动域名排行的独立更新 + startDomainUpdate(); } // 加载仪表盘数据 @@ -17,11 +27,50 @@ function loadDashboardData() { // 加载统计卡片数据 updateStatCards(); - // 加载最常屏蔽的域名 - loadTopBlockedDomains(); + // 首次加载时获取域名排行数据 + if (!domainDataCache.blocked) { + loadTopBlockedDomains(); + } + if (!domainDataCache.resolved) { + loadTopResolvedDomains(); + } +} + +// 启动域名排行的独立更新 +function startDomainUpdate() { + if (domainUpdateTimer) { + clearInterval(domainUpdateTimer); + } - // 加载最常解析的域名 - loadTopResolvedDomains(); + // 立即执行一次更新 + updateDomainRankings(); + + // 设置定时器 + domainUpdateTimer = setInterval(() => { + // 仅当当前面板是仪表盘时更新数据 + if (document.getElementById('dashboard') && document.getElementById('dashboard').classList.contains('active')) { + updateDomainRankings(); + } + }, DOMAIN_UPDATE_INTERVAL); +} + +// 停止域名排行更新 +function stopDomainUpdate() { + if (domainUpdateTimer) { + clearInterval(domainUpdateTimer); + domainUpdateTimer = null; + } +} + +// 更新域名排行数据 +function updateDomainRankings() { + // 使用Promise.all并行加载，提高效率 + Promise.all([ + loadTopBlockedDomains(true), + loadTopResolvedDomains(true) + ]).catch(error => { + console.error('更新域名排行数据失败:', error); + }); } // 更新统计卡片数据 @@ -634,17 +683,43 @@ function renderRequestsPieChart(labels, data) { }); } +// 辅助函数：深度比较两个对象是否相等 +function isEqual(obj1, obj2) { + // 处理null或undefined情况 + if (obj1 === obj2) return true; + if (obj1 == null || obj2 == null) return false; + + // 确保都是数组 + if (!Array.isArray(obj1) || !Array.isArray(obj2)) return false; + if (obj1.length !== obj2.length) return false; + + // 比较数组中每个元素 + for (let i = 0; i < obj1.length; i++) { + const a = obj1[i]; + const b = obj2[i]; + + // 比较域名和计数 + if (a.domain !== b.domain || a.count !== b.count) { + return false; + } + } + + return true; +} + // 加载最常屏蔽的域名 -function loadTopBlockedDomains() { +function loadTopBlockedDomains(isUpdate = false) { // 首先获取表格元素并显示加载状态 const topBlockedTable = document.getElementById('top-blocked-table'); const tbody = topBlockedTable ? topBlockedTable.querySelector('tbody') : null; - if (tbody) { + + // 非更新操作时显示加载状态 + if (tbody && !isUpdate) { // 显示加载中状态 tbody.innerHTML = `加载中...`; } - apiRequest('/top-blocked') + return apiRequest('/top-blocked') .then(data => { // 处理多种可能的数据格式，特别优化对用户提供格式的支持 let processedData = []; @@ -681,7 +756,16 @@ function loadTopBlockedDomains() { }); } - smoothRenderTable('top-blocked-table', processedData, renderDomainRow); + // 数据变化检测 + const hasDataChanged = !isEqual(domainDataCache.blocked, processedData); + + // 只在数据发生变化或不是更新操作时重新渲染 + if (hasDataChanged || !isUpdate) { + // 更新缓存 + domainDataCache.blocked = JSON.parse(JSON.stringify(processedData)); + // 渲染最常屏蔽的域名表格 + smoothRenderTable('top-blocked-table', processedData, renderDomainRow); + } }) .catch(error => { console.error('获取最常屏蔽域名失败:', error); @@ -699,8 +783,18 @@ function loadTopBlockedDomains() { } // 加载最常解析的域名 -function loadTopResolvedDomains() { - apiRequest('/top-resolved') +function loadTopResolvedDomains(isUpdate = false) { + // 首先获取表格元素 + const topResolvedTable = document.getElementById('top-resolved-table'); + const tbody = topResolvedTable ? topResolvedTable.querySelector('tbody') : null; + + // 非更新操作时显示加载状态 + if (tbody && !isUpdate) { + // 显示加载中状态 + tbody.innerHTML = `加载中...`; + } + + return apiRequest('/top-resolved') .then(data => { // 处理多种可能的数据格式 let processedData = []; @@ -737,7 +831,16 @@ function loadTopResolvedDomains() { }); } - smoothRenderTable('top-resolved-table', processedData, renderDomainRow); + // 数据变化检测 + const hasDataChanged = !isEqual(domainDataCache.resolved, processedData); + + // 只在数据发生变化或不是更新操作时重新渲染 + if (hasDataChanged || !isUpdate) { + // 更新缓存 + domainDataCache.resolved = JSON.parse(JSON.stringify(processedData)); + // 渲染最常解析的域名表格 + smoothRenderTable('top-resolved-table', processedData, renderDomainRow); + } }) .catch(error => { console.error('获取最常解析域名失败:', error); @@ -803,8 +906,13 @@ function smoothRenderTable(tableId, newData, rowRenderer) { const tbody = table ? table.querySelector('tbody') : null; if (!tbody) return; + // 添加过渡类，用于CSS动画支持 + tbody.classList.add('table-transition'); + if (!newData || newData.length === 0) { showEmpty(tbody, '暂无数据记录'); + // 移除过渡类 + setTimeout(() => tbody.classList.remove('table-transition'), 300); return; } @@ -838,6 +946,12 @@ function smoothRenderTable(tableId, newData, rowRenderer) { // 更新数据属性 existingRow.dataset.count = count; + // 添加高亮效果，用于CSS过渡 + existingRow.classList.add('table-row-highlight'); + setTimeout(() => { + existingRow.classList.remove('table-row-highlight'); + }, 1000); + // 如果计数变化，应用平滑更新 if (oldCount !== count) { const countCell = existingRow.querySelector('.count-cell'); @@ -854,6 +968,8 @@ function smoothRenderTable(tableId, newData, rowRenderer) { // 新数据项，创建新行 const newRow = rowRenderer(item, index); if (newRow) { + // 添加淡入动画类 + newRow.classList.add('table-row-fade-in'); // 先设置透明度为0，避免在错误位置闪烁 newRow.style.opacity = '0'; newRows.push(newRow); @@ -867,7 +983,7 @@ function smoothRenderTable(tableId, newData, rowRenderer) { const key = row.dataset.domain || row.querySelector('td:first-child').textContent; if (!updatedRows.has(key)) { // 添加淡出动画 - row.classList.add('fade-out'); + row.classList.add('table-row-fade-out'); setTimeout(() => { if (row.parentNode === tbody) { tbody.removeChild(row); @@ -901,6 +1017,14 @@ function smoothRenderTable(tableId, newData, rowRenderer) { newRows.forEach(row => { row.style.opacity = '1'; }); + + // 移除过渡类和动画类 + setTimeout(() => { + tbody.querySelectorAll('.table-row-fade-in').forEach(row => { + row.classList.remove('table-row-fade-in'); + }); + tbody.classList.remove('table-transition'); + }, 300); }, 10); // 初始化表格排序 @@ -913,34 +1037,69 @@ function smoothRenderTable(tableId, newData, rowRenderer) { // 平滑更新数字 function smoothUpdateNumber(element, oldValue, newValue) { // 如果值相同，不更新 - if (oldValue === newValue) return; + if (oldValue === newValue || !element) return; + + // 根据数值差动态调整持续时间 + const valueDiff = Math.abs(newValue - oldValue); + const baseDuration = 400; + const maxDuration = 1000; + // 数值变化越大，动画时间越长，但不超过最大值 + const duration = Math.min(baseDuration + Math.log10(valueDiff + 1) * 200, maxDuration); - // 设置动画持续时间 - const duration = 500; const startTime = performance.now(); function animate(currentTime) { const elapsedTime = currentTime - startTime; const progress = Math.min(elapsedTime / duration, 1); - // 使用缓动函数 - const easeOutQuad = 1 - (1 - progress) * (1 - progress); + // 使用easeOutQuart缓动函数，使动画更自然 + let easeOutProgress; + if (progress < 1) { + // 四阶缓动函数：easeOutQuart + easeOutProgress = 1 - Math.pow(1 - progress, 4); + } else { + easeOutProgress = 1; + } - // 计算当前值 - const currentValue = Math.floor(oldValue + (newValue - oldValue) * easeOutQuad); + // 根据不同的数值范围使用不同的插值策略 + let currentValue; + if (valueDiff < 10) { + // 小数值变化，使用线性插值 + currentValue = Math.floor(oldValue + (newValue - oldValue) * easeOutProgress); + } else if (valueDiff < 100) { + // 中等数值变化，使用四舍五入 + currentValue = Math.round(oldValue + (newValue - oldValue) * easeOutProgress); + } else { + // 大数值变化，使用更平滑的插值 + currentValue = Math.floor(oldValue + (newValue - oldValue) * easeOutProgress); + } // 更新显示 element.textContent = formatNumber(currentValue); + // 添加微小的缩放动画效果 + const scaleFactor = 1 + 0.05 * Math.sin(progress * Math.PI); + element.style.transform = `scale(${scaleFactor})`; + // 继续动画 if (progress < 1) { requestAnimationFrame(animate); } else { // 动画完成 element.textContent = formatNumber(newValue); + // 重置缩放 + element.style.transform = 'scale(1)'; + + // 触发最终的高亮效果 + element.classList.add('number-update-complete'); + setTimeout(() => { + element.classList.remove('number-update-complete'); + }, 300); } } + // 重置元素样式 + element.style.transform = 'scale(1)'; // 开始动画 requestAnimationFrame(animate); } \ No newline at end of file