天气查询结果
+{{ timestamp }}
+diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index b4741c7..b343d6d 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -1,249 +1,57 @@
-name: 部署到生产环境
+name: Auto Deploy NeoBot (Full Env Secrets)
+# 触发条件:推送到main分支 或 手动触发
on:
push:
branches: [ main ]
- pull_request:
- branches: [ main ]
workflow_dispatch:
- inputs:
- reason:
- description: '手动触发部署的原因'
- required: false
- default: '手动部署'
jobs:
- deploy:
+ deploy-to-server:
+ # 关联你的仓库环境(ENV)
+ environment: ENV
runs-on: ubuntu-latest
- environment: SSH-KEY
- timeout-minutes: 15
steps:
- - uses: actions/checkout@v4
+ - name: 检查环境密钥配置
+ run: |
+ echo "✅ 已关联环境: ${{ github.environment }}"
+ echo "✅ API_URL 密钥是否存在: ${{ secrets.API_URL != '' }}"
+ echo "✅ API_TOKEN 密钥是否存在: ${{ secrets.NEOBOT_DEPLOY_TOKEN != '' }}"
- # ========== 新增:检出代码失败时的错误处理 ==========
- - name: 处理代码检出失败
- if: failure()
- run: |
- echo "❌ 代码检出失败!请检查仓库权限或网络问题"
- exit 1
- # ========== 原有步骤:安装系统依赖工具(强化错误处理) ==========
- - name: 安装依赖工具
- id: install_sys_deps
- run: |
- set -euo pipefail
- echo "=== 开始安装系统依赖工具 ==="
- # 配置清华源加速apt更新(可选,提升安装速度)
- sudo sed -i 's/archive.ubuntu.com/mirrors.tuna.tsinghua.edu.cn/g' /etc/apt/sources.list
- sudo apt-get update -y || { echo "❌ apt更新失败"; exit 1; }
-
- # 安装工具并验证
- TOOLS="sshpass expect openssh-client"
- for TOOL in $TOOLS; do
- echo "📦 安装 $TOOL..."
- if sudo apt-get install -y --no-install-recommends $TOOL; then
- echo "✅ $TOOL 安装成功"
+ - name: 调用部署API
+ env:
+ # 从环境密钥中读取API地址和Token(均为密文)
+ API_URL: ${{ secrets.API_URL }}
+ API_TOKEN: ${{ secrets.NEOBOT_DEPLOY_TOKEN }}
+ run: |
+ # 安装jq用于解析JSON
+ sudo apt-get update && sudo apt-get install -y jq
+
+ # 打印关键信息(脱敏,仅验证是否读取到值)
+ echo "📌 调用的API地址(脱敏): $(echo $API_URL | sed 's/http:\/\///; s/\/deploy//')"
+
+ # 发送POST请求到部署API(所有配置均来自密钥)
+ RESPONSE=$(curl -s -X POST \
+ $API_URL \
+ -H "Content-Type: application/json" \
+ -H "X-API-Token: $API_TOKEN" \
+ -d '{"script_name":"deploy.sh"}')
+
+ # 打印完整响应(便于调试)
+ echo "📝 API响应详情:"
+ echo $RESPONSE | jq .
+
+ # 解析status字段判断部署结果
+ STATUS=$(echo $RESPONSE | jq -r '.status')
+ if [ "$STATUS" = "success" ]; then
+ echo "✅ 部署成功!"
+ exit 0
else
- echo "❌ $TOOL 安装失败"
+ echo "❌ 部署失败!错误信息:$(echo $RESPONSE | jq -r '.message')"
exit 1
fi
- done
-
- # 验证工具可用性
- sshpass -V >/dev/null || { echo "❌ sshpass安装后不可用"; exit 1; }
- expect -v >/dev/null || { echo "❌ expect安装后不可用"; exit 1; }
- continue-on-error: false
- # ========== 原有步骤:配置SSH密钥 ==========
- - name: 配置SSH密钥并启动ssh-agent
- id: config_ssh
- run: |
- set -euo pipefail
- echo "=== 开始配置SSH密钥 ==="
-
- # 创建SSH目录并严格控制权限
- mkdir -p ~/.ssh
- chmod 700 ~/.ssh
-
- # 处理私钥换行符问题
- echo "${{ secrets.KEY }}" | tr -d '\r' > ~/.ssh/id_rsa
- chmod 600 ~/.ssh/id_rsa
-
- # 启动ssh-agent并加载私钥
- eval $(ssh-agent -s)
- export SSH_AGENT_PID SSH_AUTH_SOCK
-
- echo "🔑 加载SSH私钥..."
- expect -c "
- set timeout 15
- spawn ssh-add ~/.ssh/id_rsa
- expect {
- \"Enter passphrase for /home/runner/.ssh/id_rsa:\" {
- send \"${{ secrets.PASSPHRASE }}\r\"
- exp_continue
- }
- \"Identity added: /home/runner/.ssh/id_rsa\" {
- puts \"✅ 私钥加载成功\"
- exit 0
- }
- \"Bad passphrase, try again\" {
- puts \"❌ 私钥密码错误(PASSPHRASE)\"
- exit 1
- }
- timeout {
- puts \"❌ 私钥加载超时\"
- exit 1
- }
- eof {
- puts \"❌ 私钥加载失败\"
- exit 1
- }
- }
- " || { echo "❌ 私钥加载失败,终止流程"; exit 1; }
-
- # 配置SSH免主机检查
- cat > ~/.ssh/config << EOF
- StrictHostKeyChecking no
- UserKnownHostsFile /dev/null
- GlobalKnownHostsFile /dev/null
- ConnectTimeout 30
- EOF
- chmod 600 ~/.ssh/config
- echo "✅ SSH密钥配置完成"
- continue-on-error: false
-
- # ========== 原有步骤:执行部署(强化错误处理) ==========
- - name: 执行部署
- id: run_deploy
- run: |
- set -euo pipefail
- echo "=== 开始执行服务器部署 ==="
-
- # 定义部署命令(抽离便于维护)
- DEPLOY_CMD=$(cat << 'EOF'
- set -exuo pipefail
- echo "=== 服务器部署开始($(date))==="
-
- # 服务器端也配置清华源(可选,如需在服务器安装pip依赖)
- pip3.14 config set global.index-url https://pypi.tuna.tsinghua.edu.cn/simple || true
-
- # 测试sudo权限
- echo "${SERVER_PASSWORD}" | sudo -S -k -p '' whoami || { echo "❌ sudo权限验证失败"; exit 1; }
-
- # 停止服务(失败不终止,避免服务未启动导致部署中断)
- echo "🛑 停止neobot服务..."
- echo "${SERVER_PASSWORD}" | sudo -S -k -p '' systemctl stop neobot.service || true
- sleep 2
-
- # 切换到项目目录
- cd /home/luoxiaolei/neobot/NeoBot || { echo "❌ 项目目录不存在"; exit 1; }
- echo "📁 当前目录:$(pwd)"
-
- # 修复文件权限
- echo "🔧 修复文件权限..."
- echo "${SERVER_PASSWORD}" | sudo -S -k -p '' chown -R "${SERVER_USER}":"${SERVER_USER}" /home/luoxiaolei/neobot/NeoBot || { echo "❌ 文件权限修复失败"; exit 1; }
-
- # 拉取最新代码
- echo "⬇️ 拉取最新代码..."
- git pull origin main || { echo "❌ 代码拉取失败"; exit 1; }
-
- # 使用pip3.14更新依赖
- echo "📦 使用pip3.14更新项目依赖..."
- if [ -f "requirements.txt" ]; then
- echo "📄 发现requirements.txt,使用pip3.14安装/升级依赖..."
- # 尝试使用pip3.14,如果不存在则使用pip3
- if command -v pip3.14 &> /dev/null; then
- pip3.14 install --upgrade -r requirements.txt || { echo "❌ pip3.14依赖安装失败"; exit 1; }
- echo "✅ pip3.14依赖安装完成"
- else
- echo "⚠️ pip3.14未找到,尝试使用pip3..."
- pip3 install --upgrade -r requirements.txt || { echo "❌ pip3.14依赖安装失败"; exit 1; }
- echo "✅ pip3.14依赖安装完成"
- fi
- else
- echo "⚠️ 未找到requirements.txt文件,跳过依赖安装"
- fi
-
- # 启动服务
- echo "🚀 启动neobot服务..."
- echo "${SERVER_PASSWORD}" | sudo -S -k -p '' systemctl start neobot.service || { echo "❌ 服务启动失败"; exit 1; }
- sleep 3
-
- # 检查服务状态
- echo "📋 检查服务状态..."
- if ! echo "${SERVER_PASSWORD}" | sudo -S -k -p '' systemctl status neobot.service --no-pager --full; then
- echo "❌ neobot服务启动异常,查看日志:"
- echo "${SERVER_PASSWORD}" | sudo -S -k -p '' journalctl -u neobot.service --no-pager -n 50
- exit 1
- fi
-
- echo "✅ 服务器部署完成($(date))==="
- EOF
- )
-
- # 替换变量并执行部署
- export SERVER_PASSWORD="${{ secrets.SERVER_PASSWORD }}"
- export SERVER_USER="${{ secrets.SERVER_USER }}"
- DEPLOY_CMD=$(echo "$DEPLOY_CMD" | sed "s/\${SERVER_PASSWORD}/${{ secrets.SERVER_PASSWORD }}/g")
- DEPLOY_CMD=$(echo "$DEPLOY_CMD" | sed "s/\${SERVER_USER}/${{ secrets.SERVER_USER }}/g")
-
- # 执行部署(带SSH调试日志)
- if ! sshpass -p "${{ secrets.SERVER_PASSWORD }}" ssh -v \
- -o IdentityFile=~/.ssh/id_rsa \
- -o ConnectTimeout=30 \
- -p 42422 ${{ secrets.SERVER_USER }}@${{ secrets.SERVER_ADDRESS }} "$DEPLOY_CMD"; then
- echo "❌ 部署命令执行失败"
- exit 1
- fi
-
- echo "✅ 部署流程全部完成"
- continue-on-error: false
-
- # ========== 强化错误处理:步骤失败后的详细提示 ==========
- - name: 部署失败详细排查
- if: failure()
- run: |
- echo "=================================================="
- echo "❌ 部署失败!详细排查信息:"
- echo "=================================================="
- # 输出各步骤状态
- echo "🔍 步骤状态:"
- echo " - 代码检出:${{ steps.install_pip_deps.outcome }}"
- echo " - pip依赖安装:${{ steps.install_pip_deps.outcome }}"
- echo " - 系统依赖安装:${{ steps.install_sys_deps.outcome }}"
- echo " - SSH配置:${{ steps.config_ssh.outcome }}"
- echo " - 部署执行:${{ steps.run_deploy.outcome }}"
-
- # 按失败步骤给出排查建议
- if [ "${{ steps.install_pip_deps.outcome }}" = "failure" ]; then
- echo "📌 排查重点(pip依赖安装失败):"
- echo " 1. 检查requirements.txt文件格式是否正确"
- echo " 2. 检查清华源是否可访问:curl https://pypi.tuna.tsinghua.edu.cn/simple"
- echo " 3. 检查依赖包名称/版本是否存在错误"
- fi
-
- if [ "${{ steps.config_ssh.outcome }}" = "failure" ]; then
- echo "📌 排查重点(SSH配置失败):"
- echo " 1. 检查KEY私钥是否完整(包含BEGIN/END标记)"
- echo " 2. 检查PASSPHRASE私钥密码是否正确"
- echo " 3. 检查服务器公钥是否已添加到authorized_keys"
- fi
-
- if [ "${{ steps.run_deploy.outcome }}" = "failure" ]; then
- echo "📌 排查重点(部署执行失败):"
- echo " 1. 检查SERVER_PASSWORD服务器密码是否正确"
- echo " 2. 检查服务器42422端口是否开放"
- echo " 3. 检查服务器项目目录是否存在:/home/luoxiaolei/neobot/NeoBot"
- echo " 4. 查看服务器日志:journalctl -u neobot.service -n 50"
- fi
- exit 1
-
- # ========== 部署成功提示 ==========
- - name: 部署成功提示
- if: success()
- run: |
- echo "✅ 部署成功!"
- echo "📝 部署信息:"
- echo " - 触发方式:${{ github.event_name }}"
- echo " - 分支:${{ github.ref_name }}"
- echo " - 提交ID:${{ github.sha }}"
- echo " - 手动触发原因:${{ github.event.inputs.reason || '自动触发' }}"
+ - name: 部署失败通知(可选)
+ if: failure()
+ run: |
+ echo "⚠️ 部署失败,可在此添加通知逻辑"
diff --git a/plugins/weather.py b/plugins/weather.py
new file mode 100644
index 0000000..ec1ceea
--- /dev/null
+++ b/plugins/weather.py
@@ -0,0 +1,240 @@
+# -*- coding: utf-8 -*-
+import re
+from datetime import datetime
+from typing import Any, Dict, List
+
+import requests
+
+from core.managers.command_manager import matcher
+from core.managers.image_manager import image_manager
+from core.utils.logger import logger
+from models import MessageEvent, MessageSegment
+
+# 插件元数据
+__plugin_meta__ = {
+ "name": "weather",
+ "description": "查询天气信息,支持中国天气网数据。",
+ "usage": "/天气 [城市代码] - 查询指定城市的天气信息\n例如:/天气 101190207 (南京)",
+}
+
+# 城市代码映射(可以扩展)
+CITY_CODES = {
+ "北京": "101010100",
+ "上海": "101020100",
+ "广州": "101280101",
+ "深圳": "101280601",
+ "南京": "101190101",
+ "苏州": "101190401",
+ "杭州": "101210101",
+ "武汉": "101200101",
+ "成都": "101270101",
+ "重庆": "101040100",
+ "西安": "101110101",
+ "天津": "101030100",
+ "沈阳": "101070101",
+ "大连": "101070201",
+ "青岛": "101120201",
+ "济南": "101120101",
+ "郑州": "101180101",
+ "长沙": "101250101",
+ "南昌": "101240101",
+ "合肥": "101220101",
+ "福州": "101230101",
+ "厦门": "101230201",
+ "南宁": "101300101",
+ "海口": "101310101",
+ "昆明": "101290101",
+ "贵阳": "101260101",
+ "拉萨": "101140101",
+ "兰州": "101160101",
+ "西宁": "101150101",
+ "银川": "101170101",
+ "乌鲁木齐": "101130101",
+ "哈尔滨": "101050101",
+ "长春": "101060101",
+ "呼和浩特": "101080101",
+ "太原": "101100101",
+ "石家庄": "101090101",
+}
+
+HEADERS = {
+ "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/91.0.4472.124 Safari/537.36"
+}
+
+
+def get_weather_data(city_code: str) -> Dict[str, Any]:
+ """
+ 获取天气数据
+
+ Args:
+ city_code (str): 城市代码
+
+ Returns:
+ Dict[str, Any]: 包含城市信息和天气数据的字典
+ """
+ try:
+ url = f"https://www.weather.com.cn/weather/{city_code}.shtml"
+ response = requests.get(url, headers=HEADERS, timeout=10)
+ response.encoding = "utf-8"
+ html_content = response.text
+
+ # 提取城市信息
+ city_info = (
+ html_content.split('")[0]
+ .strip()
+ )
+
+ city_parts = []
+ city_parts.append(city_info.split("")[-1].split("")[0])
+
+ if city_info.count("_blank") == 1:
+ city_parts.append(
+ city_info.split(">")[-1]
+ .replace("", "")
+ .replace("", "")
+ .strip()
+ )
+ else:
+ additional_parts = (
+ city_info.split('target="_blank">')[-1]
+ .replace("> ", "")
+ .replace("", "")
+ .split("")
+ )
+ city_parts.extend(additional_parts)
+
+ city_name = " ".join([part for part in city_parts if part.strip()])
+
+ # 提取天气信息
+ weather_data = []
+ for i in range(7):
+ try:
+ weather_info = (
+ html_content.split(' ')[0]
+ .strip()
+ )
+
+ tem = (
+ weather_info.split("")[-1]
+ .split("")[0]
+ .replace("/", " / ")
+ .strip()
+ )
+ if len(tem) > 10:
+ tem = weather_info.split("")[1].split("")[0].strip()
+
+ wind = weather_info.split('')[0]
+ .replace('" class="', " / ")
+ )
+ else:
+ wind_direction.append(
+ wind[1].split('">')[-1]
+ .split('on">')[1]
+ .split("")[i]
+ )
+
+ day = weather_info.split("
')[0].replace('" class="', " / ")
+ )
+ wind_power = weather_info.split("")[-1].split("")[0].strip()
+
+ wind_direction_str = (
+ " / ".join(wind_direction) if wind_direction else "未知"
+ )
+
+ weather_data.append(
+ {
+ "day": day,
+ "weather": weather,
+ "temperature": tem,
+ "wind_power": wind_power,
+ "wind_direction": wind_direction_str,
+ }
+ )
+
+ except (IndexError, ValueError) as e:
+ logger.warning(f"解析第{i + 1}天天气数据失败: {e}")
+ continue
+
+ return {
+ "city_name": city_name,
+ "weather_data": weather_data,
+ "query_time": datetime.now().strftime("%Y-%m-%d %H:%M:%S"),
+ "timestamp": datetime.now().strftime("%Y年%m月%d日 %H:%M"),
+ }
+
+ except Exception as e:
+ logger.error(f"获取天气数据失败: {e}")
+ return None
+
+
+@matcher.command("天气")
+async def handle_weather(bot, event: MessageEvent, args: List[str]):
+ """
+ 处理天气查询指令
+
+ Args:
+ bot: Bot实例
+ event: 消息事件
+ args: 指令参数
+ """
+ if not args:
+ # 显示支持的城市列表
+ city_list = "\n".join(
+ [f"{name}: {code}" for name, code in list(CITY_CODES.items())[:10]]
+ )
+ reply_msg = f"请指定城市名称或城市代码,例如:\n/天气 北京\n/天气 101010100\n\n支持的城市:\n{city_list}\n..."
+ await event.reply(reply_msg)
+ return
+
+ city_input = args[0].strip()
+
+ # 尝试匹配城市名称或直接使用城市代码
+ city_code = None
+ if city_input in CITY_CODES:
+ city_code = CITY_CODES[city_input]
+ elif re.match(r"^\d{9}$", city_input):
+ city_code = city_input
+ else:
+ # 尝试模糊匹配城市名称
+ for name, code in CITY_CODES.items():
+ if city_input in name:
+ city_code = code
+ break
+
+ if not city_code:
+ await event.reply(f"未找到城市 '{city_input}',请检查城市名称或使用城市代码。")
+ return
+
+ # 获取天气数据
+ await event.reply("正在查询天气信息,请稍候...")
+ weather_info = get_weather_data(city_code)
+
+ if not weather_info or not weather_info.get("weather_data"):
+ await event.reply("获取天气信息失败,请稍后重试。")
+ return
+
+ try:
+ # 渲染HTML模板为图片
+ base64_image = await image_manager.render_template_to_base64(
+ "weather.html", weather_info, output_name="weather.png"
+ )
+
+ if base64_image:
+ # 发送图片消息
+ await event.reply(MessageSegment.image(base64_image))
+ else:
+ await event.reply("生成天气图片失败,请稍后重试。")
+
+ except Exception as e:
+ logger.error(f"渲染天气图片失败: {e}")
+ await event.reply("生成天气图片时发生错误,请稍后重试。")
diff --git a/templates/weather.html b/templates/weather.html
new file mode 100644
index 0000000..6576f55
--- /dev/null
+++ b/templates/weather.html
@@ -0,0 +1,312 @@
+
+
+")[-1].split("
")[0].strip()
+ weather = (
+ weather_info.split('
{{ timestamp }}
+