更新项目配置:添加.gitignore,清理日志和缓存文件,更新应用代码
This commit is contained in:
@@ -1,23 +1,18 @@
|
||||
"""
|
||||
摄像头管理器
|
||||
处理登录、会话管理和摄像头配置
|
||||
处理摄像头配置和URL生成
|
||||
"""
|
||||
import requests
|
||||
import logging
|
||||
from datetime import datetime
|
||||
from .config import BASE_URL, LOGIN_API, CAMERA_URL, USERNAME, PASSWORD, CAMERAS
|
||||
from .config import BASE_URL, CAMERA_URL, CAMERAS
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
class CameraManager:
|
||||
def __init__(self):
|
||||
self.base_url = BASE_URL
|
||||
self.login_api = LOGIN_API
|
||||
self.camera_url = CAMERA_URL
|
||||
self.session = requests.Session()
|
||||
self.token = None
|
||||
self.last_login_time = None
|
||||
self.is_logged_in = False
|
||||
self.cameras = CAMERAS
|
||||
|
||||
# 配置请求头
|
||||
@@ -28,50 +23,6 @@ class CameraManager:
|
||||
'Content-Type': 'application/json',
|
||||
'Connection': 'keep-alive',
|
||||
})
|
||||
|
||||
# 不自动登录,按需登录
|
||||
# self.auto_login()
|
||||
|
||||
def login(self):
|
||||
"""登录系统"""
|
||||
logger.info("正在登录系统...")
|
||||
|
||||
login_data = {
|
||||
'username': USERNAME,
|
||||
'password': PASSWORD,
|
||||
'email': USERNAME,
|
||||
'user': USERNAME,
|
||||
'account': USERNAME
|
||||
}
|
||||
|
||||
try:
|
||||
response = self.session.post(
|
||||
self.login_api,
|
||||
json=login_data,
|
||||
timeout=10
|
||||
)
|
||||
|
||||
if response.status_code == 200:
|
||||
response_data = response.json()
|
||||
self.token = response_data.get('token')
|
||||
self.last_login_time = datetime.now()
|
||||
self.is_logged_in = True
|
||||
|
||||
# 更新认证头
|
||||
if self.token:
|
||||
self.session.headers.update({
|
||||
'Authorization': f'Bearer {self.token}'
|
||||
})
|
||||
|
||||
logger.info("登录成功!")
|
||||
return True
|
||||
else:
|
||||
logger.error(f"登录失败,状态码: {response.status_code}")
|
||||
return False
|
||||
|
||||
except Exception as e:
|
||||
logger.error(f"登录请求失败: {e}")
|
||||
return False
|
||||
|
||||
def get_camera_url(self, camera_id, camera_number='mixed'):
|
||||
"""根据摄像头ID和编号生成URL"""
|
||||
|
||||
Reference in New Issue
Block a user