From 5ca5c540ba36c3d0a9914eb71319720147e45db6 Mon Sep 17 00:00:00 2001
From: frxz751113 <156018267+frxz751113@users.noreply.github.com>
Date: Thu, 29 Aug 2024 01:42:56 +0800
Subject: [PATCH] =?UTF-8?q?Update=20and=20rename=20=E7=BD=91=E7=BB=9C?=
 =?UTF-8?q?=E6=94=B6=E9=9B=861.py=20to=20=E7=BD=91=E7=BB=9C=E6=94=B6?=
 =?UTF-8?q?=E9=9B=86.py?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 py/{网络收集1.py => 网络收集.py} | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)
 rename py/{网络收集1.py => 网络收集.py} (98%)

diff --git a/py/网络收集1.py b/py/网络收集.py
similarity index 98%
rename from py/网络收集1.py
rename to py/网络收集.py
index ee5aa12..339ce51 100644
--- a/py/网络收集1.py
+++ b/py/网络收集.py
@@ -74,12 +74,18 @@ def merge_txt_files(urls, output_filename='汇总.txt'):
             for url in urls:
                 try:
                     response = requests.get(url)
-                    response.raise_for_status()
-                    outfile.write(response.text + '\n')
+                    response.raise_for_status()  # 确保请求成功
+                    # 尝试将响应内容解码为UTF-8，如果失败则尝试其他编码
+                    try:
+                        content = response.content.decode('utf-8')
+                    except UnicodeDecodeError:
+                        content = response.content.decode('gbk')  # 尝试GBK编码
+                    outfile.write(content + '\n')
                 except requests.RequestException as e:
                     print(f'Error downloading {url}: {e}')
     except IOError as e:
         print(f'Error writing to file: {e}')
+
 # 调用函数
 merge_txt_files(urls)