'commit'
This commit is contained in:
@@ -12,8 +12,6 @@ if project_root not in sys.path:
|
||||
from Apps.XinDianTu.Service import XinDianTuService
|
||||
from Apps.XinDianTu import Opener
|
||||
from Apps.XinDianTu import Crawler
|
||||
from Apps.XinDianTu import Coord as Y4_Coord
|
||||
from Apps.XinDianTu import GetCookie as T2_GetAmapCookie
|
||||
|
||||
# 配置日志
|
||||
logging.basicConfig(
|
||||
@@ -59,35 +57,6 @@ async def main():
|
||||
except Exception as e:
|
||||
logger.error(f"❌ 步骤 2 执行异常: {e}")
|
||||
return
|
||||
|
||||
# 步骤 3: 补全坐标 (调用 Y4_Coord)
|
||||
logger.info(">>> 步骤 3: 启动高德地图坐标回填任务...")
|
||||
try:
|
||||
# 首次尝试,开启 Cookie 检查
|
||||
await Y4_Coord.main(check_cookie_first=True)
|
||||
except Y4_Coord.CookieInvalidError:
|
||||
logger.warning("⚠️ 检测到高德地图 Cookie 失效或缺失。")
|
||||
logger.info(">>> 正在启动 Cookie 获取工具 (T2)...")
|
||||
logger.info("请在弹出的浏览器窗口中完成登录,然后在控制台按回车确认。")
|
||||
|
||||
# 调用同步的 T2 工具
|
||||
# 由于 T2 包含 input() 阻塞,且这是客户端脚本,直接调用即可
|
||||
try:
|
||||
# 传入 force=True 跳过“文件已存在”的询问,因为我们确定它无效
|
||||
# run_in_executor 用于避免完全阻塞事件循环(虽然在这里影响不大)
|
||||
loop = asyncio.get_event_loop()
|
||||
success = await loop.run_in_executor(None, T2_GetAmapCookie.run_login_tool, True)
|
||||
|
||||
if success:
|
||||
logger.info("✅ Cookie 更新成功,正在重新启动坐标回填任务...")
|
||||
# 再次尝试执行,这次可以跳过检查(刚获取完)或者继续检查
|
||||
await Y4_Coord.main(check_cookie_first=False)
|
||||
else:
|
||||
logger.error("❌ Cookie 获取失败或用户取消,跳过坐标回填步骤。")
|
||||
except Exception as e:
|
||||
logger.error(f"❌ 调用 T2 工具失败: {e}")
|
||||
except Exception as e:
|
||||
logger.error(f"❌ 步骤 3 执行异常: {e}")
|
||||
|
||||
finally:
|
||||
# 确保数据库连接关闭
|
||||
|
||||
Reference in New Issue
Block a user