jzw/VWED_server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复打包exe情况下 代理缓存问题

Browse Source
This commit is contained in:
靳中伟 2025-10-16 10:34:22 +08:00
parent a699729b58
commit 23b7b99dc6
11 changed files with 5256 additions and 4734 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5236
logs/app.log
View File

File diff suppressed because it is too large Load Diff

4714
logs/app.log.2025-10-13 Normal file
View File

File diff suppressed because it is too large Load Diff

BIN
routes/__pycache__/lsp_websocket_api.cpython-312.pyc
View File

Binary file not shown.

BIN
services/__pycache__/sync_service.cpython-312.pyc
View File

Binary file not shown.

BIN
services/__pycache__/task_record_service.cpython-312.pyc
View File

Binary file not shown.

BIN
services/enhanced_scheduler/__pycache__/task_scheduler.cpython-312.pyc
View File

Binary file not shown.

BIN
services/execution/handlers/__pycache__/robot_scheduling.cpython-312.pyc
View File

Binary file not shown.

BIN
services/online_script/built_in_modules/__pycache__/http_module.cpython-312.pyc
View File

Binary file not shown.

6
services/online_script/built_in_modules/http_module.py
View File

@ -103,7 +103,7 @@ class VWEDHttpModule:
# 使用aiohttp进行异步请求，避免阻塞事件循环
timeout = aiohttp.ClientTimeout(total=60) # 60秒超时
async with aiohttp.ClientSession(timeout=timeout) as session:
async with aiohttp.ClientSession(timeout=timeout, trust_env=False) as session:
# 使用json参数而不是data参数，让aiohttp自动处理JSON序列化和Content-Type
async with session.post(url, json=dict_param, headers={k: v for k, v in headers.items() if k.lower() != 'content-type'}) as response:
response.raise_for_status()
@ -237,7 +237,7 @@ class VWEDHttpModule:
# 使用aiohttp进行异步请求，避免阻塞事件循环
timeout = aiohttp.ClientTimeout(total=60) # 60秒超时
async with aiohttp.ClientSession(timeout=timeout) as session:
async with aiohttp.ClientSession(timeout=timeout, trust_env=False) as session:
# 根据方法选择合适的请求方式
if method.upper() == "GET":
async with session.get(url, headers=request_headers) as response:
@ -442,7 +442,7 @@ class VWEDHttpModule:
# 使用aiohttp进行异步请求，避免阻塞事件循环
timeout = aiohttp.ClientTimeout(total=60) # 60秒超时
async with aiohttp.ClientSession(timeout=timeout) as session:
async with aiohttp.ClientSession(timeout=timeout, trust_env=False) as session:
async with session.get(url, headers=headers) as response:
response.raise_for_status()
result = await response.text()

34
services/sync_service.py
View File

@ -145,7 +145,7 @@ async def create_task(task_record_id: str, task_name: str, is_periodic: bool, pr
logger.debug(f"创建任务请求参数: {request_data.model_dump_json()}")
# 优化超时配置，分别设置连接超时和总超时
timeout = aiohttp.ClientTimeout(total=TFApiConfig.TIMEOUT, connect=5)
async with aiohttp.ClientSession(timeout=timeout) as session:
async with aiohttp.ClientSession(timeout=timeout, trust_env=False) as session:
async with session.post(
url,
json=request_data.model_dump(),
@ -216,7 +216,7 @@ async def create_choose_amr_task(task_id: str, key_station_name: str, amr_name:
logger.info(f"正在创建选择AMR任务: {task_id}, 站点: {key_station_name}")
timeout = aiohttp.ClientTimeout(total=TFApiConfig.TIMEOUT, connect=5)
async with aiohttp.ClientSession(timeout=timeout) as session:
async with aiohttp.ClientSession(timeout=timeout, trust_env=False) as session:
async with session.post(
url,
json=request_data.model_dump(),
@ -275,7 +275,7 @@ async def add_action(task_id: str, station_name: str, action: str, token: str =
logger.info(f"正在为任务添加动作: {task_id}, 站点: {station_name}, 动作: {action}")
timeout = aiohttp.ClientTimeout(total=TFApiConfig.TIMEOUT, connect=5)
async with aiohttp.ClientSession(timeout=timeout) as session:
async with aiohttp.ClientSession(timeout=timeout, trust_env=False) as session:
async with session.post(
url,
json=request_data.model_dump(),
@ -323,7 +323,7 @@ async def closure_task(task_id: str, token: str = None) -> Optional[ApiResponse]
logger.info(f"正在封口任务: {task_id}")
timeout = aiohttp.ClientTimeout(total=TFApiConfig.TIMEOUT, connect=5)
async with aiohttp.ClientSession(timeout=timeout) as session:
async with aiohttp.ClientSession(timeout=timeout, trust_env=False) as session:
async with session.put(
url,
headers=headers
@ -368,7 +368,7 @@ async def get_task_block_detail(task_block_id: str, token: str = None) -> Option
logger.info(f"正在获取任务块详情: {task_block_id}")
timeout = aiohttp.ClientTimeout(total=TFApiConfig.TIMEOUT, connect=5)
async with aiohttp.ClientSession(timeout=timeout) as session:
async with aiohttp.ClientSession(timeout=timeout, trust_env=False) as session:
async with session.get(
url,
headers=headers
@ -417,7 +417,7 @@ async def get_task_block_action_detail(task_block_id: str, token: str = None) ->
logger.info(f"正在获取任务块动作详情: {task_block_id}")
timeout = aiohttp.ClientTimeout(total=TFApiConfig.TIMEOUT, connect=5)
async with aiohttp.ClientSession(timeout=timeout) as session:
async with aiohttp.ClientSession(timeout=timeout, trust_env=False) as session:
async with session.get(
url,
headers=headers
@ -598,7 +598,7 @@ async def set_task_in_progress(task_id: str, token: str = None) -> Optional[ApiR
logger.info(f"正在设置系统任务状态为执行中: {task_id}")
timeout = aiohttp.ClientTimeout(total=TFApiConfig.TIMEOUT, connect=5)
async with aiohttp.ClientSession(timeout=timeout) as session:
async with aiohttp.ClientSession(timeout=timeout, trust_env=False) as session:
async with session.put(
url,
headers=headers
@ -643,7 +643,7 @@ async def set_task_completed(task_id: str, token: str = None) -> Optional[ApiRes
try:
logger.info(f"正在设置系统任务状态为已完成: {task_id}")
timeout = aiohttp.ClientTimeout(total=TFApiConfig.TIMEOUT, connect=5)
async with aiohttp.ClientSession(timeout=timeout) as session:
async with aiohttp.ClientSession(timeout=timeout, trust_env=False) as session:
async with session.put(
url,
headers=headers
@ -688,7 +688,7 @@ async def set_task_terminated(task_id: str, token: str = None) -> Optional[ApiRe
logger.info(f"正在设置系统任务状态为已终止: {task_id}")
timeout = aiohttp.ClientTimeout(total=TFApiConfig.TIMEOUT, connect=5)
async with aiohttp.ClientSession(timeout=timeout) as session:
async with aiohttp.ClientSession(timeout=timeout, trust_env=False) as session:
async with session.put(
url,
headers=headers
@ -732,7 +732,7 @@ async def set_task_failed(task_id: str, token: str = None) -> Optional[ApiRespon
logger.info(f"正在设置任务状态为已失败: {task_id}")
timeout = aiohttp.ClientTimeout(total=TFApiConfig.TIMEOUT, connect=5)
async with aiohttp.ClientSession(timeout=timeout) as session:
async with aiohttp.ClientSession(timeout=timeout, trust_env=False) as session:
async with session.put(
url,
headers=headers
@ -782,7 +782,7 @@ async def set_task_description(task_id: str, description: str, token: str = None
logger.info(f"正在设置VWED任务描述: {task_id}, 描述: {description}")
timeout = aiohttp.ClientTimeout(total=TFApiConfig.TIMEOUT, connect=5)
async with aiohttp.ClientSession(timeout=timeout) as session:
async with aiohttp.ClientSession(timeout=timeout, trust_env=False) as session:
async with session.put(
url,
json=request_data,
@ -831,7 +831,7 @@ async def get_amr_info(token: str = None) -> Optional[Dict[str, Any]]:
logger.info("正在获取AMR信息")
timeout = aiohttp.ClientTimeout(total=TFApiConfig.TIMEOUT, connect=5)
async with aiohttp.ClientSession(timeout=timeout) as session:
async with aiohttp.ClientSession(timeout=timeout, trust_env=False) as session:
async with session.get(
url,
headers=headers
@ -888,7 +888,7 @@ async def get_amr_list(token: str = None, **params) -> Optional[Dict[str, Any]]:
logger.info("正在获取AMR列表")
timeout = aiohttp.ClientTimeout(total=TFApiConfig.TIMEOUT, connect=5)
async with aiohttp.ClientSession(timeout=timeout) as session:
async with aiohttp.ClientSession(timeout=timeout, trust_env=False) as session:
async with session.get(
url,
params=params,
@ -997,7 +997,7 @@ async def get_login_token(username: str = "vwed", password: str = "vwed_123456")
logger.debug(f"登录请求参数: {request_data.model_dump_json()}")
timeout = aiohttp.ClientTimeout(total=TFApiConfig.TIMEOUT, connect=5)
async with aiohttp.ClientSession(timeout=timeout) as session:
async with aiohttp.ClientSession(timeout=timeout, trust_env=False) as session:
async with session.post(
url,
json=request_data.model_dump(),
@ -1310,7 +1310,7 @@ async def get_amr_detail(amr_id: str, token: str = None) -> Optional[Dict[str, A
logger.info(f"正在获取AMR详情: {amr_id}")
timeout = aiohttp.ClientTimeout(total=TFApiConfig.TIMEOUT, connect=5)
async with aiohttp.ClientSession(timeout=timeout) as session:
async with aiohttp.ClientSession(timeout=timeout, trust_env=False) as session:
async with session.get(
url,
headers=headers
@ -1406,7 +1406,7 @@ async def modify_amr_charge_param(amr_id: str, charge_params: dict, token: str =
logger.info(f"正在修改机器人参数: {amr_id}, 参数: {api_params}")
timeout = aiohttp.ClientTimeout(total=TFApiConfig.TIMEOUT, connect=5)
async with aiohttp.ClientSession(timeout=timeout) as session:
async with aiohttp.ClientSession(timeout=timeout, trust_env=False) as session:
async with session.put(
url,
json=api_params,
@ -1474,7 +1474,7 @@ async def update_exchange_amr_status(original_task_id: str, exchange_amr_status:
logger.info(f"正在更新换机器人状态: 任务ID={original_task_id}, 状态={exchange_amr_status}")
timeout = aiohttp.ClientTimeout(total=TFApiConfig.TIMEOUT, connect=5)
async with aiohttp.ClientSession(timeout=timeout) as session:
async with aiohttp.ClientSession(timeout=timeout, trust_env=False) as session:
async with session.post(
url,
json=request_data,

BIN
utils/__pycache__/built_in_functions.cpython-312.pyc
View File

Binary file not shown.