README.md

@@ -15,9 +15,6 @@
 </p>
 
 # 1.2.3版本与1.2.6+版本区别
-#### **请使用自定义key，因不填写key、或使用服务端自动生成的key而引起的链接超时或建立链接时间过长的问题，不在本项目解决范围内。**
-
-
 > rustdesk官方在其新版服务端中已[强制要求key](https://rustdesk.com/docs/zh-cn/self-host/rustdesk-server-oss/install/#key)(rustdesk-server版本号大概>=1.1.10)
 
 - rustdesk版本<=1.2.3, 服务端请配合使用rustdesk-server<=1.1.10

api/views_api.py

@@ -14,15 +14,6 @@ from .views_front import *
 from django.utils.translation import gettext as _
 
 
-def get_client_ip(request):
-    x_forwarded_for = request.META.get('HTTP_X_FORWARDED_FOR')
-    if x_forwarded_for:
-        ip = x_forwarded_for.split(',')[0]
-    else:
-        ip = request.META.get('REMOTE_ADDR')
-    return ip
-
-
 def login(request):
     result = {}
     if request.method == 'GET':
@@ -235,7 +226,7 @@ def sysinfo(request):
     if request.method == 'GET':
         result['error'] = _('错误的提交方式！')
         return JsonResponse(result)
-    client_ip = get_client_ip(request)
+    client_ip = request.META.get('REMOTE_ADDR')
     postdata = json.loads(request.body)
     device = RustDesDevice.objects.filter(Q(rid=postdata['id']) & Q(uuid=postdata['uuid'])).first()
     if not device:
@@ -264,7 +255,7 @@ def heartbeat(request):
     postdata = json.loads(request.body)
     device = RustDesDevice.objects.filter(Q(rid=postdata['id']) & Q(uuid=postdata['uuid'])).first()
     if device:
-        client_ip = get_client_ip(request)
+        client_ip = request.META.get('REMOTE_ADDR')
         device.ip_address = client_ip
         device.save()
     # token保活

api/views_front.py

@@ -229,9 +229,6 @@ def get_all_info():
         if device:
             devices[peer.rid]['rust_user'] = user.username
 
-    for rid in devices.keys():
-        if not devices[rid].get('rust_user', ''):
-            devices[rid]['rust_user'] = _('未登录')
     for k, v in devices.items():
         devices[k]['status'] = _('在线') if (now - datetime.datetime.strptime(v['update_time'], '%Y-%m-%d %H:%M')).seconds <= 120 else _('离线')
     return [v for k, v in devices.items()]
@@ -298,7 +295,7 @@ def share(request):
     sharelinks = ShareLink.objects.filter(Q(uid=request.user.id) & Q(is_used=False) & Q(is_expired=False))
 
     # 省资源：处理已过期请求，不主动定时任务轮询请求，在任意地方请求时，检查是否过期，过期则保存。
-    # now = datetime.datetime.now()
+    now = datetime.datetime.now()
     for sl in sharelinks:
         check_sharelink_expired(sl)
     sharelinks = ShareLink.objects.filter(Q(uid=request.user.id) & Q(is_used=False) & Q(is_expired=False))
@@ -330,7 +327,7 @@ def share(request):
                     # 自己的peers若重叠，需要跳过
                     peers_self_ids = [x.rid for x in RustDeskPeer.objects.filter(Q(uid=request.user.id))]
                     peers_share = RustDeskPeer.objects.filter(Q(rid__in=peers) & Q(uid=sharelink.uid))
-                    # peers_share_ids = [x.rid for x in peers_share]
+                    peers_share_ids = [x.rid for x in peers_share]
 
                     for peer in peers_share:
                         if peer.rid in peers_self_ids: