diff --git a/Apps/XinDianTu/Config/Setting.py b/Apps/XinDianTu/Config/Setting.py index 2f89d9e..8e40389 100644 --- a/Apps/XinDianTu/Config/Setting.py +++ b/Apps/XinDianTu/Config/Setting.py @@ -1,7 +1,7 @@ # 采集配置 SCROLL_DISTANCE_RATIO = 0.5 -MAX_STATIONS_COUNT = 2 +MAX_STATIONS_COUNT = 20 FIRST_RUN_ONLY_ONE_STATION = True REDIS_STATION_EXPIRE = 120 DATA_RETENTION_DAYS = 365 diff --git a/Apps/XinDianTu/Config/__pycache__/Setting.cpython-310.pyc b/Apps/XinDianTu/Config/__pycache__/Setting.cpython-310.pyc index 0d8c1b5..f77809d 100644 Binary files a/Apps/XinDianTu/Config/__pycache__/Setting.cpython-310.pyc and b/Apps/XinDianTu/Config/__pycache__/Setting.cpython-310.pyc differ diff --git a/Apps/XinDianTu/Crawler.py b/Apps/XinDianTu/Crawler.py index f970b3c..588ebfd 100644 --- a/Apps/XinDianTu/Crawler.py +++ b/Apps/XinDianTu/Crawler.py @@ -242,8 +242,18 @@ async def get_station_list(d, service, uploader, max_stations_count=MAX_STATIONS logger.info(f"--- [进度: {current_idx}/{max_stations_count}, 剩余: {remaining}] 发现新场站 '{station_name}',开始处理... ---") new_stations_processed_in_page += 1 total_new_processed_count += 1 - - click_x, click_y = card["click_point"] + + click_x = st.get("uia_center_x") + click_y = st.get("uia_center_y") + if click_x is None or click_y is None: + cp = card.get("click_point") or (None, None) + if isinstance(cp, (list, tuple)) and len(cp) >= 2: + click_x, click_y = cp[0], cp[1] + + if click_x is None or click_y is None: + logger.warning(f"场站 '{station_name}' 缺少有效点击坐标,跳过。") + continue + logger.info(f"准备处理场站: {station_name}, 点击坐标: ({click_x}, {click_y})") d.click(int(click_x), int(click_y)) diff --git a/Apps/XinDianTu/__pycache__/Crawler.cpython-310.pyc b/Apps/XinDianTu/__pycache__/Crawler.cpython-310.pyc index 111133e..1d27959 100644 Binary files a/Apps/XinDianTu/__pycache__/Crawler.cpython-310.pyc and b/Apps/XinDianTu/__pycache__/Crawler.cpython-310.pyc differ diff --git a/T4_TeLaiDian.py b/T1_TeLaiDian.py similarity index 100% rename from T4_TeLaiDian.py rename to T1_TeLaiDian.py diff --git a/T1_XinDianTu.py b/T2_XinDianTu.py similarity index 100% rename from T1_XinDianTu.py rename to T2_XinDianTu.py diff --git a/T2_AiTeJiYiChong.py b/T3_AiTeJiYiChong.py similarity index 100% rename from T2_AiTeJiYiChong.py rename to T3_AiTeJiYiChong.py diff --git a/T3_YeLiTe.py b/T4_YeLiTe.py similarity index 100% rename from T3_YeLiTe.py rename to T4_YeLiTe.py