From 6fc4e791264f9774570f5da2895ee48b7afe9566 Mon Sep 17 00:00:00 2001
From: yshtcn <k.yshtcn+github@gmail.com>
Date: Sun, 23 Jul 2023 13:20:28 +0800
Subject: [PATCH] Update heartbeat.py
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

增加socks5代理支持
---
 heartbeat.py | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/heartbeat.py b/heartbeat.py
index c906b40..0794cf6 100644
--- a/heartbeat.py
+++ b/heartbeat.py
@@ -16,24 +16,26 @@ log_file_path = os.path.join(current_dir, 'heartbeat.log')
 logging.basicConfig(filename=log_file_path, level=logging.INFO)
 
 def create_image():
-    # Generate an image and draw a pattern
     width, height = 64, 64
-    color1 = "black"
+    color1 = "black" 
     color0 = "white"
+
     image = Image.new('RGB', (width, height), color1)
     d = ImageDraw.Draw(image)
-    d.rectangle(
-        [(width // 2, 0), (width, height)],
-        fill=color0)
+
+    # 画图标
+    d.arc((32,0, 64,32), 0, 180, fill=color0)
+    d.rectangle((0, 32, 32, 64), fill=color0)
+
     return image
 
 # Create an Event object to signal the heartbeat thread to stop
 stop_heartbeat = threading.Event()
 
-def heartbeat(interval, heartbeat_url):
+def heartbeat(interval, heartbeat_url, session):
     while not stop_heartbeat.is_set():
         try:
-            response = requests.get(heartbeat_url)
+            response = session.get(heartbeat_url)
             logging.info(f"{datetime.now()} Response status code: {response.status_code}")
         except requests.exceptions.RequestException as e:
             logging.info(f"{datetime.now()} An error occurred: {e}")
@@ -50,16 +52,20 @@ def quit_action(icon, item):
 image = create_image()
 icon = pystray.Icon("系统心跳", image, "系统状态报送", menu=pystray.Menu(pystray.MenuItem('关闭主机状态报送', quit_action)))
 
-
-
 # 从配置文件读取设置
 config = configparser.ConfigParser()
 config.read(os.path.join(current_dir, 'config.ini'))
 interval = config.getint('Settings', 'interval')
 heartbeat_url = config.get('Settings', 'heartbeat_url')
 
+# 创建一个新的Session对象，并根据需要配置代理
+session = requests.Session()
+if config.get('Settings', 'proxy_enabled', fallback='0') == '1':
+    session.proxies = {'http': config.get('Settings', 'proxy_url'),
+                       'https': config.get('Settings', 'proxy_url')}
+
 # Start the heartbeat function in a new thread
-t = threading.Thread(target=heartbeat, args=(interval, heartbeat_url))
+t = threading.Thread(target=heartbeat, args=(interval, heartbeat_url, session))
 t.start()
 
 icon.run(setup)