修复邮件系统问题：1. 优化邮件存储逻辑确保mailbox_id正确赋值 2. 修复SMTP服务处理逻辑 3. 添加系统诊断接口 4. 新增测试脚本
This commit is contained in:
huangzhenpc
@@ -1,15 +1,155 @@
|
||||
from flask import request, jsonify, current_app
|
||||
import base64
|
||||
import re
|
||||
import os
|
||||
import email
|
||||
from email import policy
|
||||
import re
|
||||
import base64
|
||||
from datetime import datetime, timedelta
|
||||
import psutil
|
||||
import time
|
||||
|
||||
from flask import jsonify, request, current_app
|
||||
from sqlalchemy import or_, func, desc
|
||||
|
||||
from . import api_bp
|
||||
from ..models import get_session, Domain, Mailbox, Email
|
||||
from ..models import Email, Domain, Mailbox, get_session
|
||||
from ..services import get_mail_store
|
||||
|
||||
# 调试接口 - 检查邮件接收状态
|
||||
@api_bp.route('/debug_email', methods=['GET'])
|
||||
def debug_email():
|
||||
"""
|
||||
调试接口：检查某个邮箱的邮件状态并提供详细信息
|
||||
|
||||
查询参数:
|
||||
- email: 邮箱地址 (例如: newsadd1test@nosqli.com)
|
||||
"""
|
||||
try:
|
||||
# 获取查询参数
|
||||
email_address = request.args.get('email')
|
||||
|
||||
# 验证邮箱地址是否有效
|
||||
if not email_address or '@' not in email_address:
|
||||
return jsonify({
|
||||
'success': False,
|
||||
'error': '无效的邮箱地址',
|
||||
'message': '请提供有效的邮箱地址，格式为user@domain.com'
|
||||
}), 400
|
||||
|
||||
# 解析邮箱地址
|
||||
username, domain_name = email_address.split('@', 1)
|
||||
|
||||
result = {
|
||||
'email_address': email_address,
|
||||
'username': username,
|
||||
'domain': domain_name,
|
||||
'system_info': {},
|
||||
'logs': [],
|
||||
'files': []
|
||||
}
|
||||
|
||||
# 查询数据库
|
||||
db = get_session()
|
||||
try:
|
||||
# 查找域名
|
||||
domain = db.query(Domain).filter_by(name=domain_name).first()
|
||||
|
||||
if domain:
|
||||
result['system_info']['domain'] = {
|
||||
'id': domain.id,
|
||||
'name': domain.name,
|
||||
'active': domain.active,
|
||||
'created_at': str(domain.created_at) if hasattr(domain, 'created_at') else None
|
||||
}
|
||||
|
||||
# 查找邮箱
|
||||
mailbox = db.query(Mailbox).filter_by(
|
||||
domain_id=domain.id,
|
||||
address=username
|
||||
).first()
|
||||
|
||||
if mailbox:
|
||||
result['system_info']['mailbox'] = {
|
||||
'id': mailbox.id,
|
||||
'address': mailbox.address,
|
||||
'full_address': f"{mailbox.address}@{domain_name}",
|
||||
'created_at': str(mailbox.created_at) if hasattr(mailbox, 'created_at') else None
|
||||
}
|
||||
|
||||
# 获取邮件
|
||||
emails = db.query(Email).filter_by(mailbox_id=mailbox.id).all()
|
||||
|
||||
result['system_info']['emails_count'] = len(emails)
|
||||
result['system_info']['emails'] = []
|
||||
|
||||
for email_obj in emails:
|
||||
email_info = {
|
||||
'id': email_obj.id,
|
||||
'subject': email_obj.subject,
|
||||
'sender': email_obj.sender,
|
||||
'received_at': str(email_obj.received_at),
|
||||
'verification_code': email_obj.verification_code if hasattr(email_obj, 'verification_code') else None
|
||||
}
|
||||
result['system_info']['emails'].append(email_info)
|
||||
else:
|
||||
result['system_info']['mailbox'] = "未找到邮箱记录"
|
||||
else:
|
||||
result['system_info']['domain'] = "未找到域名记录"
|
||||
|
||||
# 查找文件
|
||||
email_data_dir = current_app.config.get('MAIL_STORAGE_PATH', 'email_data')
|
||||
emails_dir = os.path.join(email_data_dir, 'emails')
|
||||
|
||||
if os.path.exists(emails_dir):
|
||||
for file_name in os.listdir(emails_dir):
|
||||
if file_name.endswith('.eml'):
|
||||
file_path = os.path.join(emails_dir, file_name)
|
||||
file_info = {
|
||||
'name': file_name,
|
||||
'path': file_path,
|
||||
'size': os.path.getsize(file_path),
|
||||
'modified': datetime.fromtimestamp(os.path.getmtime(file_path)).isoformat()
|
||||
}
|
||||
|
||||
# 尝试读取文件内容并检查是否包含收件人地址
|
||||
try:
|
||||
with open(file_path, 'r', encoding='utf-8', errors='replace') as f:
|
||||
content = f.read(10000) # 只读取前10000个字符用于检查
|
||||
if email_address.lower() in content.lower():
|
||||
file_info['contains_address'] = True
|
||||
result['files'].append(file_info)
|
||||
except Exception as e:
|
||||
file_info['error'] = str(e)
|
||||
result['files'].append(file_info)
|
||||
|
||||
# 检查日志
|
||||
log_file = current_app.config.get('LOG_FILE', os.path.join('logs', 'email_system.log'))
|
||||
if os.path.exists(log_file):
|
||||
try:
|
||||
with open(log_file, 'r', encoding='utf-8', errors='replace') as f:
|
||||
# 从日志尾部读取最后200行
|
||||
lines = f.readlines()[-200:]
|
||||
for line in lines:
|
||||
if email_address.lower() in line.lower():
|
||||
result['logs'].append(line.strip())
|
||||
except Exception as e:
|
||||
result['logs'] = [f"读取日志出错: {str(e)}"]
|
||||
|
||||
return jsonify({
|
||||
'success': True,
|
||||
'debug_info': result
|
||||
}), 200
|
||||
|
||||
finally:
|
||||
db.close()
|
||||
|
||||
except Exception as e:
|
||||
current_app.logger.error(f"调试邮件出错: {str(e)}")
|
||||
return jsonify({
|
||||
'success': False,
|
||||
'error': '服务器错误',
|
||||
'message': str(e)
|
||||
}), 500
|
||||
|
||||
# 创建邮箱接口
|
||||
@api_bp.route('/add_mailbox', methods=['POST', 'GET'])
|
||||
def add_mailbox():
|
||||
@@ -408,4 +548,161 @@ def extract_verification_code(body_text, body_html):
|
||||
if matches:
|
||||
return matches[0].strip()
|
||||
|
||||
return None
|
||||
return None
|
||||
|
||||
|
||||
# 系统诊断接口
|
||||
@api_bp.route('/system_check', methods=['GET'])
|
||||
def system_check():
|
||||
"""
|
||||
系统诊断接口：检查邮件系统各组件状态
|
||||
"""
|
||||
try:
|
||||
result = {
|
||||
'timestamp': datetime.now().isoformat(),
|
||||
'system_status': 'normal',
|
||||
'components': {},
|
||||
'recent_activity': {},
|
||||
'mailboxes': [],
|
||||
'storage': {}
|
||||
}
|
||||
|
||||
# 检查系统资源
|
||||
try:
|
||||
result['components']['system'] = {
|
||||
'cpu_percent': psutil.cpu_percent(),
|
||||
'memory_percent': psutil.virtual_memory().percent,
|
||||
'disk_usage': psutil.disk_usage('/').percent
|
||||
}
|
||||
except Exception as e:
|
||||
result['components']['system'] = {'error': str(e)}
|
||||
|
||||
# 检查数据库状态
|
||||
db = get_session()
|
||||
try:
|
||||
# 获取域名数量
|
||||
domain_count = db.query(Domain).count()
|
||||
|
||||
# 获取邮箱数量
|
||||
mailbox_count = db.query(Mailbox).count()
|
||||
|
||||
# 获取邮件数量
|
||||
email_count = db.query(Email).count()
|
||||
|
||||
# 获取最新邮件
|
||||
latest_emails = db.query(Email).order_by(Email.received_at.desc()).limit(5).all()
|
||||
|
||||
result['components']['database'] = {
|
||||
'status': 'connected',
|
||||
'domain_count': domain_count,
|
||||
'mailbox_count': mailbox_count,
|
||||
'email_count': email_count
|
||||
}
|
||||
|
||||
# 最近活动
|
||||
result['recent_activity']['latest_emails'] = [
|
||||
{
|
||||
'id': email.id,
|
||||
'subject': email.subject,
|
||||
'sender': email.sender,
|
||||
'received_at': email.received_at.isoformat() if email.received_at else None
|
||||
} for email in latest_emails
|
||||
]
|
||||
|
||||
# 获取所有活跃邮箱
|
||||
active_mailboxes = db.query(Mailbox).order_by(Mailbox.id).limit(10).all()
|
||||
result['mailboxes'] = [
|
||||
{
|
||||
'id': mb.id,
|
||||
'address': mb.address,
|
||||
'domain_id': mb.domain_id,
|
||||
'full_address': f"{mb.address}@{mb.domain.name}" if hasattr(mb, 'domain') and mb.domain else f"{mb.address}@unknown",
|
||||
'email_count': db.query(Email).filter_by(mailbox_id=mb.id).count()
|
||||
} for mb in active_mailboxes
|
||||
]
|
||||
|
||||
except Exception as e:
|
||||
result['components']['database'] = {'status': 'error', 'error': str(e)}
|
||||
finally:
|
||||
db.close()
|
||||
|
||||
# 检查存储状态
|
||||
email_data_dir = current_app.config.get('MAIL_STORAGE_PATH', 'email_data')
|
||||
try:
|
||||
emails_dir = os.path.join(email_data_dir, 'emails')
|
||||
attachments_dir = os.path.join(email_data_dir, 'attachments')
|
||||
|
||||
# 检查目录是否存在
|
||||
emails_dir_exists = os.path.exists(emails_dir)
|
||||
attachments_dir_exists = os.path.exists(attachments_dir)
|
||||
|
||||
# 计算文件数量和大小
|
||||
email_files_count = 0
|
||||
email_files_size = 0
|
||||
if emails_dir_exists:
|
||||
for file_name in os.listdir(emails_dir):
|
||||
if file_name.endswith('.eml'):
|
||||
email_files_count += 1
|
||||
email_files_size += os.path.getsize(os.path.join(emails_dir, file_name))
|
||||
|
||||
attachment_files_count = 0
|
||||
attachment_files_size = 0
|
||||
if attachments_dir_exists:
|
||||
for file_name in os.listdir(attachments_dir):
|
||||
attachment_files_count += 1
|
||||
attachment_files_size += os.path.getsize(os.path.join(attachments_dir, file_name))
|
||||
|
||||
result['storage'] = {
|
||||
'emails_dir': {
|
||||
'exists': emails_dir_exists,
|
||||
'path': emails_dir,
|
||||
'file_count': email_files_count,
|
||||
'size_bytes': email_files_size,
|
||||
'size_mb': round(email_files_size / (1024 * 1024), 2) if email_files_size > 0 else 0
|
||||
},
|
||||
'attachments_dir': {
|
||||
'exists': attachments_dir_exists,
|
||||
'path': attachments_dir,
|
||||
'file_count': attachment_files_count,
|
||||
'size_bytes': attachment_files_size,
|
||||
'size_mb': round(attachment_files_size / (1024 * 1024), 2) if attachment_files_size > 0 else 0
|
||||
}
|
||||
}
|
||||
|
||||
# 检查最近的邮件文件
|
||||
if emails_dir_exists and email_files_count > 0:
|
||||
files = [(os.path.getmtime(os.path.join(emails_dir, f)), f)
|
||||
for f in os.listdir(emails_dir) if f.endswith('.eml')]
|
||||
files.sort(reverse=True)
|
||||
|
||||
result['recent_activity']['latest_files'] = [
|
||||
{
|
||||
'filename': f,
|
||||
'modified': datetime.fromtimestamp(t).isoformat(),
|
||||
'age_seconds': int(time.time() - t)
|
||||
} for t, f in files[:5]
|
||||
]
|
||||
|
||||
except Exception as e:
|
||||
result['storage'] = {'error': str(e)}
|
||||
|
||||
# 整体状态评估
|
||||
if ('database' in result['components'] and result['components']['database'].get('status') != 'connected'):
|
||||
result['system_status'] = 'warning'
|
||||
|
||||
if not emails_dir_exists or not attachments_dir_exists:
|
||||
result['system_status'] = 'warning'
|
||||
|
||||
return jsonify({
|
||||
'success': True,
|
||||
'status': result['system_status'],
|
||||
'diagnostics': result
|
||||
}), 200
|
||||
|
||||
except Exception as e:
|
||||
current_app.logger.error(f"系统诊断出错: {str(e)}")
|
||||
return jsonify({
|
||||
'success': False,
|
||||
'error': '系统诊断失败',
|
||||
'message': str(e)
|
||||
}), 500
|
||||
Reference in New Issue
Block a user