From f526e37ed4f1eccefedc12c3b5973a71f2a29420 Mon Sep 17 00:00:00 2001
From: jshixiong <2645476194@qq.com>
Date: Wed, 14 Aug 2024 17:04:46 +0800
Subject: [PATCH] =?UTF-8?q?fix(login=5Finfo):=20=E4=BD=BF=E7=94=A8?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95=E7=8E=AF=E5=A2=83=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/login_info.py | 31 +++++++++++++------------------
 1 file changed, 13 insertions(+), 18 deletions(-)

diff --git a/app/login_info.py b/app/login_info.py
index c8cc86a..4127d6d 100644
--- a/app/login_info.py
+++ b/app/login_info.py
@@ -2,7 +2,6 @@ import json
 import requests
 import logging
 
-login_file_path = '/data/ww/py_sys_monitor/info/login_info'
 
 def get_recent_login_info(page_index=1, page_size=10):
     if page_index <= 0:
@@ -11,23 +10,19 @@ def get_recent_login_info(page_index=1, page_size=10):
     if page_size <=0 or page_size > 20:
         page_size = 10
 
-    login_info = []
-    with open(login_file_path, 'r') as f:
-        lines = f.readlines()
-    
-    total = len(lines)
-
-    start = (page_index - 1) * page_size
-    # end = start + page_size
-    # start = total - 1 - page_index * page_size
-    end = start + page_size
-    
-    if start < total:
-        for line in lines[start:end]:
-            record = json.loads(line.strip())
-            login_info.append(record)
+    data = {"status":-1,"message":"响应失败"}
+    try:
+        url = f"http://test-data.educoder.net/api/home/online_users.json?limit={page_size}&page={page_index}"
+        response = requests.get(url)
+        data = response.json()
+        response.raise_for_status()  # 如果响应状态码不是 200，会引发 HTTPError
+        logging.info(f"请求{url} 返回参数: {data}")
+    except requests.exceptions.RequestException as e:
+        # 处理可能的请求错误
+        logging.info(f"recent_login_info请求发生错误: {e}")
+        
+    return data
     
-    return {"login_info" : login_info, "total" : total}
 
 
 def get_online_size():
@@ -45,5 +40,5 @@ def get_online_size():
 
     except requests.exceptions.RequestException as e:
         # 处理可能的请求错误
-        logging.info(f"请求发生错误: {e}")
+        logging.info(f"online_size请求发生错误: {e}")
         return 0
\ No newline at end of file