fix: use host network and restore web chat records

This commit is contained in:
ngfchl
2026-07-06 19:44:23 +08:00
parent 251b926b6f
commit 04781f144c
7 changed files with 329 additions and 40 deletions
+2 -2
View File
@@ -6,14 +6,14 @@ TG_CHAT_ID=-100xxxxxxxxxx
# Tortoise ORM 使用 postgres:// scheme,不是 postgresql://
# 宿主机/本地运行用外部地址:
DATABASE_URL=postgres://user:password@192.168.123.5:15432/tg-spam-guard
# Docker Compose 会覆盖为:postgres://user_eNPcQS:${POSTGRES_PASSWORD}@1Panel-postgresql-KS6e:5432/tg-spam-guard
# Docker Compose 使用 host 网络,会覆盖为:postgres://user_eNPcQS:${POSTGRES_PASSWORD}@127.0.0.1:15432/tg-spam-guard
# 生产环境请在 .env 中设置真实密码,不要提交 .env
POSTGRES_PASSWORD=your_postgres_password
# Ollama
# 宿主机/本地运行:
OLLAMA_URL=http://127.0.0.1:11434
# Docker Compose 会覆盖为:http://host.docker.internal:11434
# Docker Compose 使用 host 网络,会覆盖为:http://127.0.0.1:11434
OLLAMA_MODEL=qwen3:8b
# Proxy
+1 -1
View File
@@ -8,7 +8,7 @@ TG_CHAT_ID = int(os.getenv("TG_CHAT_ID", "0"))
# PostgreSQL
DATABASE_URL = os.getenv(
"DATABASE_URL",
"postgresql://postgres:postgres@192.168.123.5:15432/tg_spam_guard",
"postgres://user:password@127.0.0.1:15432/tg-spam-guard",
)
# Ollama
+5 -15
View File
@@ -3,26 +3,16 @@ services:
build: .
container_name: tg-spam-guard
restart: unless-stopped
ports:
- "8766:8766"
network_mode: host
env_file: .env
environment:
# 容器内 1panel-network 服务名,比外部 IP 更稳定
DATABASE_URL: postgres://user_eNPcQS:${POSTGRES_PASSWORD}@1Panel-postgresql-KS6e:5432/tg-spam-guard
# Linux Docker 访问宿主机 Ollama,避免 127.0.0.1 指向容器自身
OLLAMA_URL: http://host.docker.internal:11434
NO_PROXY: 127.0.0.1,localhost,host.docker.internal,1Panel-postgresql-KS6e
# host 网络模式:容器内 127.0.0.1 即宿主机
DATABASE_URL: postgres://user_eNPcQS:${POSTGRES_PASSWORD}@127.0.0.1:15432/tg-spam-guard
OLLAMA_URL: http://127.0.0.1:11434
NO_PROXY: 127.0.0.1,localhost
KNOWLEDGE_SEARCH_MODE: lite
extra_hosts:
- "host.docker.internal:host-gateway"
volumes:
- ./logs:/app/logs
- ./knowledge/index:/app/knowledge/index
- ./knowledge/models:/app/knowledge/models
- ./knowledge/qa_cache.json:/app/knowledge/qa_cache.json
networks:
- 1panel-network
networks:
1panel-network:
external: true
+15 -4
View File
@@ -34,11 +34,22 @@ def split_answer(text: str, max_len: int = 3500, max_parts: int = 3) -> list[str
return parts
async def safe_send(update: Update, context: ContextTypes.DEFAULT_TYPE, text: str):
"""优先回复原消息;若原消息已被自动删除,退回普通 send_message。"""
chat_id = update.effective_chat.id
try:
return await update.message.reply_text(text)
except Exception as e:
if "Message to be replied not found" not in str(e):
logger.warning(f"reply_text 失败,改用 send_message: {e}")
return await context.bot.send_message(chat_id=chat_id, text=text)
async def cmd_ask(update: Update, context: ContextTypes.DEFAULT_TYPE):
"""向知识库提问"""
query = " ".join(context.args) if context.args else ""
if not query:
reply = await update.message.reply_text(
reply = await safe_send(update, context,
"❓ 用法: /ask <你的问题>\n"
"例如: /ask 怎么安装收割机\n"
f"文档地址: {config.SITE_URL}"
@@ -48,7 +59,7 @@ async def cmd_ask(update: Update, context: ContextTypes.DEFAULT_TYPE):
return
logger.info(f"📩 用户提问: [{update.message.from_user.username}] {query}")
searching_msg = await update.message.reply_text("🔍 正在搜索知识库并整理详细答案...")
searching_msg = await safe_send(update, context, "🔍 正在搜索知识库并整理详细答案...")
asyncio.create_task(auto_delete(update.message))
asyncio.create_task(auto_delete(searching_msg, seconds=8))
@@ -60,13 +71,13 @@ async def cmd_ask(update: Update, context: ContextTypes.DEFAULT_TYPE):
parts = split_answer(answer)
for i, part in enumerate(parts, 1):
prefix = f"📚 回答 {i}/{len(parts)}\n\n" if len(parts) > 1 else ""
reply = await update.message.reply_text(prefix + part)
reply = await safe_send(update, context, prefix + part)
replies.append(reply)
for reply in replies:
asyncio.create_task(auto_delete(reply, seconds=180))
except Exception as e:
logger.error(f"❌ 回答失败: {e}")
reply = await update.message.reply_text(f"❌ 回答失败: {e}")
reply = await safe_send(update, context, f"❌ 回答失败: {e}")
asyncio.create_task(auto_delete(reply))
+40 -3
View File
@@ -9,6 +9,7 @@ from telegram.ext import ContextTypes, MessageHandler, filters
import config
from db.models import Message, Ban, Action
from services.spam_detector import detect
from web.api import broadcast_sse, json_safe
logger = logging.getLogger("spam_guard")
@@ -48,8 +49,8 @@ async def handle_message(update: Update, context: ContextTypes.DEFAULT_TYPE):
logger.warning(f"⚡ 防刷屏: @{username} ({user.id}) {len(_flood_cache[user.id])}条/{config.RATE_LIMIT_WINDOW}s")
return
# 记录消息
await Message.create(
# 记录消息并推送到 Web 管理页
message_record = await Message.create(
msg_id=msg.message_id,
chat_id=update.effective_chat.id,
user_id=user.id,
@@ -57,12 +58,36 @@ async def handle_message(update: Update, context: ContextTypes.DEFAULT_TYPE):
first_name=first_name,
text=text[:500],
)
await broadcast_sse("chat", json_safe({
"id": message_record.id,
"msg_id": msg.message_id,
"chat_id": update.effective_chat.id,
"user_id": user.id,
"username": username,
"first_name": first_name,
"text": text[:500],
"time": message_record.created_at,
"spam": False,
}))
# === 垃圾检测 ===
is_spam, reason = await detect(text, username, first_name)
if is_spam:
logger.warning(f"🚨 垃圾消息 [{username}]: {reason}")
await message_record.update_from_dict({"is_spam": True, "spam_reason": reason}).save()
await broadcast_sse("spam", json_safe({
"id": message_record.id,
"msg_id": msg.message_id,
"chat_id": update.effective_chat.id,
"user_id": user.id,
"username": username,
"first_name": first_name,
"text": text[:500],
"time": message_record.created_at,
"spam": True,
"reason": reason,
}))
# 删消息
try:
@@ -86,8 +111,20 @@ async def handle_message(update: Update, context: ContextTypes.DEFAULT_TYPE):
"duration_minutes": config.BAN_DURATION_MINUTES,
"unban_at": unban_at,
}
await Ban.create(**ban_record)
ban = await Ban.create(**ban_record)
await Action.create(action="BAN", user_id=user.id, username=username, details={"reason": reason})
await broadcast_sse("ban", json_safe({
"id": ban.id,
"user_id": user.id,
"username": username,
"first_name": first_name,
"reason": reason,
"method": "auto",
"duration_minutes": config.BAN_DURATION_MINUTES,
"auto_unban": True,
"unban_at": unban_at,
"time": ban.created_at,
}))
logger.info(f"🔨 已封禁 [{username}] {config.BAN_DURATION_MINUTES} 分钟")
except Exception as e:
logger.error(f"❌ 封禁失败: {e}")
+23 -2
View File
@@ -62,16 +62,36 @@ async def api_stats(day: str = Query(default=None, pattern=r"^\d{4}-\d{2}-\d{2}$
return JSONResponse(await get_daily_stats(day))
def normalize_message(row: dict) -> dict:
row = dict(row)
row["time"] = row.get("created_at")
row["spam"] = row.get("is_spam", False)
return row
def normalize_ban(row: dict) -> dict:
row = dict(row)
row["time"] = row.get("created_at")
return row
@app.get("/api/messages")
async def api_messages(limit: int = Query(default=50, ge=1, le=500)):
msgs = await Message.all().order_by("-created_at").limit(limit).values()
return JSONResponse(json_safe(list(msgs)))
return JSONResponse(json_safe([normalize_message(m) for m in msgs]))
@app.get("/api/chat")
async def api_chat(limit: int = Query(default=100, ge=1, le=500)):
"""兼容旧前端:返回聊天记录。"""
msgs = await Message.all().order_by("-created_at").limit(limit).values()
return JSONResponse(json_safe([normalize_message(m) for m in msgs]))
@app.get("/api/bans")
async def api_bans(limit: int = Query(default=100, ge=1, le=500)):
bans = await Ban.all().order_by("-created_at").limit(limit).values()
return JSONResponse(json_safe(list(bans)))
return JSONResponse(json_safe([normalize_ban(b) for b in bans]))
@app.get("/api/actions")
@@ -111,6 +131,7 @@ async def api_stream(request: Request):
async def event_generator():
try:
yield {"event": "connected", "data": "ok"}
while True:
if await request.is_disconnected():
break
+243 -13
View File
@@ -3,43 +3,273 @@
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>🛡️ TG Spam Guard</title>
<title>🛡️ TG Spam Guard - 收割机</title>
<link rel="stylesheet" href="https://unpkg.com/element-ui@2.15.14/lib/theme-chalk/index.css">
<style>
body { margin: 0; background: #f5f7fa; }
#app { padding: 20px; max-width: 1200px; margin: 0 auto; }
.header-card { background: linear-gradient(135deg, #409eff, #6366f1); border-radius: 12px; padding: 24px 32px; margin-bottom: 20px; color: white; }
#app { padding: 20px; }
.header-card {
background: linear-gradient(135deg, #409eff, #6366f1);
border-radius: 12px;
padding: 24px 32px;
margin-bottom: 20px;
color: white;
display: flex;
justify-content: space-between;
align-items: center;
}
.header-card h1 { margin: 0; font-size: 22px; }
.header-card .status { display: flex; align-items: center; gap: 8px; font-size: 14px; opacity: 0.9; }
.stats-row { margin-bottom: 20px; }
.stat-card { text-align: center; padding: 20px; }
.stat-card .num { font-size: 32px; font-weight: bold; color: #409eff; }
.stat-card .label { font-size: 13px; color: #909399; margin-top: 6px; }
.stat-card.danger .num { color: #f56c6c; }
.stat-card.success .num { color: #67c23a; }
.stat-card.warning .num { color: #e6a23c; }
.chat-panel, .ban-panel { height: 520px; }
.chat-item {
padding: 10px 0;
border-bottom: 1px solid #ebeef5;
transition: background 0.2s;
}
.chat-item:hover { background: #f5f7fa; }
.chat-item .meta { display: flex; justify-content: space-between; margin-bottom: 4px; }
.chat-item .user { font-weight: 600; color: #409eff; font-size: 14px; }
.chat-item .time { font-size: 12px; color: #c0c4cc; }
.chat-item .text { font-size: 14px; color: #606266; line-height: 1.6; }
.ban-item {
padding: 12px 0;
border-bottom: 1px solid #ebeef5;
display: flex;
justify-content: space-between;
align-items: center;
}
.ban-info { flex: 1; }
.ban-info .user { font-weight: 600; color: #f56c6c; font-size: 14px; }
.ban-info .reason { font-size: 13px; color: #909399; margin-top: 3px; }
.ban-info .time { font-size: 12px; color: #c0c4cc; margin-top: 2px; }
.panel-header {
display: flex;
justify-content: space-between;
align-items: center;
margin-bottom: 12px;
}
.panel-header h3 { margin: 0; font-size: 16px; color: #303133; }
.empty-text { text-align: center; padding: 60px 0; color: #c0c4cc; }
.empty-text .icon { font-size: 48px; margin-bottom: 10px; display: block; }
.sse-dot {
display: inline-block;
width: 8px; height: 8px;
border-radius: 50%;
margin-right: 6px;
}
.sse-dot.on { background: #67c23a; }
.sse-dot.off { background: #f56c6c; }
</style>
</head>
<body>
<div id="app">
<!-- 头部 -->
<div class="header-card">
<h1>🛡️ TG Spam Guard v2</h1>
<h1>🛡️ TG Spam Guard</h1>
<div class="status">
<span class="sse-dot" :class="sseConnected ? 'on' : 'off'"></span>
{{ sseConnected ? '已连接' : '连接中...' }}
</div>
</div>
<!-- 统计 -->
<el-row class="stats-row" :gutter="20">
<el-col :span="6">
<el-card shadow="hover" class="stat-card">
<div class="num">{{ stats.today_bans }}</div>
<div class="label">今日封禁</div>
</el-card>
</el-col>
<el-col :span="6">
<el-card shadow="hover" class="stat-card danger">
<div class="num">{{ stats.total_bans }}</div>
<div class="label">累计封禁</div>
</el-card>
</el-col>
<el-col :span="6">
<el-card shadow="hover" class="stat-card warning">
<div class="num">{{ stats.active_bans }}</div>
<div class="label">当前封禁中</div>
</el-card>
</el-col>
<el-col :span="6">
<el-card shadow="hover" class="stat-card success">
<div class="num">{{ chatLogs.length }}</div>
<div class="label">聊天记录</div>
</el-card>
</el-col>
</el-row>
<!-- 主内容 -->
<el-row :gutter="20">
<el-col :span="6"><el-card shadow="hover" class="stat-card"><div class="num">{{ stats.messages || 0 }}</div><div class="label">💬 消息</div></el-card></el-col>
<el-col :span="6"><el-card shadow="hover" class="stat-card"><div class="num">{{ stats.joins || 0 }}</div><div class="label">🆕 入群</div></el-card></el-col>
<el-col :span="6"><el-card shadow="hover" class="stat-card"><div class="num">{{ stats.today_bans || 0 }}</div><div class="label">🔨 封禁</div></el-card></el-col>
<el-col :span="6"><el-card shadow="hover" class="stat-card danger"><div class="num">{{ stats.deleted || 0 }}</div><div class="label">🗑️ 删除</div></el-card></el-col>
<!-- 聊天记录 -->
<el-col :span="12">
<el-card shadow="hover" class="chat-panel">
<div class="panel-header">
<h3>💬 实时聊天</h3>
<el-tag size="small" type="info">{{ chatLogs.length }} 条</el-tag>
</div>
<div style="overflow-y:auto; height:440px;" ref="chatScroll">
<div v-if="chatLogs.length === 0" class="empty-text">
<span class="icon">💬</span>等待消息...
</div>
<div v-for="(item, i) in chatLogs" :key="i" class="chat-item">
<div class="meta">
<span class="user">@{{ item.username }} ({{ item.user_id }})</span>
<span class="time">{{ formatTime(item.time) }}</span>
</div>
<div class="text">{{ item.text }}</div>
</div>
</div>
</el-card>
</el-col>
<!-- 封禁列表 -->
<el-col :span="12">
<el-card shadow="hover" class="ban-panel">
<div class="panel-header">
<h3>🚫 封禁列表</h3>
<el-button size="mini" icon="el-icon-refresh" @click="loadBans">刷新</el-button>
</div>
<div style="overflow-y:auto; height:440px;">
<div v-if="bans.length === 0" class="empty-text">
<span class="icon"></span>暂无封禁记录
</div>
<div v-for="(item, i) in bans" :key="i" class="ban-item">
<div class="ban-info">
<div class="user">@{{ item.username }} ({{ item.user_id }})</div>
<div class="reason">📝 {{ item.reason }}</div>
<div class="time">⏰ {{ formatTime(item.time) }}</div>
</div>
<el-button
v-if="item.auto_unban !== false"
size="small"
type="danger"
:loading="item._loading"
@click="unbanUser(item)"
>解封</el-button>
<el-tag v-else size="small" type="success">已解封</el-tag>
</div>
</div>
</el-card>
</el-col>
</el-row>
</div>
<script src="https://unpkg.com/vue@2.7.16/dist/vue.min.js"></script>
<script src="https://unpkg.com/element-ui@2.15.14/lib/index.js"></script>
<script>
new Vue({
el: '#app',
data() { return { stats: {} } },
async mounted() {
const r = await fetch('/api/stats');
this.stats = await r.json();
data() {
return {
sseConnected: false,
chatLogs: [],
bans: [],
stats: { today_bans: 0, total_bans: 0, active_bans: 0 },
}
},
mounted() {
this.loadChatHistory()
this.loadBans()
this.loadStats()
this.connectSSE()
setInterval(() => this.loadStats(), 30000)
},
methods: {
// SSE
connectSSE() {
if (this._es) this._es.close()
const es = new EventSource('/api/stream')
this._es = es
es.addEventListener('connected', () => {
this.sseConnected = true
})
es.addEventListener('chat', (e) => {
const data = JSON.parse(e.data)
this.chatLogs.unshift(data)
if (this.chatLogs.length > 100) this.chatLogs.pop()
})
es.addEventListener('ban', (e) => {
const data = JSON.parse(e.data)
data._loading = false
this.bans.unshift(data)
if (this.bans.length > 50) this.bans.pop()
this.loadStats()
this.$message({ type: 'error', message: `🚫 封禁 @${data.username} - ${data.reason}`, duration: 5000 })
})
es.addEventListener('unban', (e) => {
const data = JSON.parse(e.data)
const ban = this.bans.find(b => b.user_id === data.user_id)
if (ban) ban.auto_unban = false
this.loadStats()
this.$message({ type: 'success', message: `✅ 已解封 ${data.username || data.user_id}`, duration: 3000 })
})
es.addEventListener('heartbeat', () => {})
es.onerror = () => {
this.sseConnected = false
setTimeout(() => this.connectSSE(), 3000)
}
},
// API
async loadChatHistory() {
try {
const r = await fetch('/api/chat')
this.chatLogs = await r.json()
} catch (e) {}
},
async loadBans() {
try {
const r = await fetch('/api/bans')
const data = await r.json()
this.bans = data.map(b => ({ ...b, _loading: false }))
} catch (e) {}
},
async loadStats() {
try {
const r = await fetch('/api/stats')
this.stats = await r.json()
} catch (e) {}
},
async unbanUser(item) {
this.$set(item, '_loading', true)
try {
const r = await fetch(`/api/unban/${item.user_id}`, { method: 'POST' })
const data = await r.json()
if (data.ok) {
item.auto_unban = false
this.$message.success(`✅ 已解封 @${item.username}`)
this.loadStats()
} else {
this.$message.error(`❌ 解封失败: ${data.error}`)
}
} catch (e) {
this.$message.error('❌ 网络错误')
}
this.$set(item, '_loading', false)
},
formatTime(iso) {
if (!iso) return ''
const d = new Date(iso)
return d.toLocaleTimeString('zh-CN', { hour: '2-digit', minute: '2-digit', second: '2-digit' })
},
}
});
})
</script>
</body>
</html>