更新说明

client1.2.7，server1.1.11恢复正常连接速度方法

.github/workflows/auto-close-issues.yml

@@ -0,0 +1,56 @@
+name: Auto Close Issues if Not Starred
+
+on:
+  issues:
+    types: [opened]
+
+jobs:
+  close_issue:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Check if user has starred the repo
+      id: check_star
+      run: |
+        ISSUE_USER=$(jq -r '.issue.user.login' < $GITHUB_EVENT_PATH)
+        echo "Issue created by user: $ISSUE_USER"
+        PAGE=1
+        STARRED=""
+        
+        while [[ -z "$STARRED" ]]; do
+          STARRED_RESPONSE=$(curl -s -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" \
+              "https://api.github.com/repos/${{ github.repository }}/stargazers?per_page=100&page=$PAGE")
+          echo "STARRED_RESPONSE=$STARRED_RESPONSE"  # 输出 API 返回的数据以检查结构
+
+          if [[ -z "$STARRED_RESPONSE" || "$STARRED_RESPONSE" == "[]" ]]; then
+            break
+          fi
+
+          STARRED=$(echo "$STARRED_RESPONSE" | jq -r '.[] | select(.login == "'$ISSUE_USER'") | .login')
+          PAGE=$((PAGE + 1))
+        done
+
+        if [[ -z "$STARRED" ]]; then
+          echo "User has not starred the repo."
+        else
+          echo "User has starred the repo."
+        fi
+
+        echo "starred=$STARRED" >> $GITHUB_ENV
+
+
+
+
+    - name: Close issue if not starred
+      if: env.starred == '0'
+      run: |
+        ISSUE_NUMBER=$(jq -r '.issue.number' < $GITHUB_EVENT_PATH)
+        echo "Closing issue #$ISSUE_NUMBER"
+        curl -s -X POST -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" \
+        -H "Accept: application/vnd.github.v3+json" \
+        https://api.github.com/repos/${{ github.repository }}/issues/$ISSUE_NUMBER/comments \
+        -d '{"body":"Please star the project before submitting an issue."}'
+
+        curl -s -X PATCH -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" \
+        -H "Accept: application/vnd.github.v3+json" \
+        https://api.github.com/repos/${{ github.repository }}/issues/$ISSUE_NUMBER \
+        -d '{"state":"closed"}'

Dockerfile

@@ -3,6 +3,13 @@ FROM python:3.10.3-alpine
 WORKDIR /rustdesk-api-server
 ADD . /rustdesk-api-server
 
+# 安装系统依赖
+RUN apk add --no-cache \
+    gcc \
+    musl-dev \
+    mariadb-connector-c-dev \
+    pkgconfig
+
 RUN set -ex \
     && pip install --no-cache-dir --disable-pip-version-check -r requirements.txt \
     && rm -rf /var/cache/apk/* \

README.md

@@ -1,13 +1,12 @@
 # rustdesk-api-server
 
-## 请使用客户端最新版本1.2.3
 
 [The English explanation is available by clicking here.](https://github.com/kingmo888/rustdesk-api-server/blob/master/README_EN.md)
 
 <p align="center">
     <i>一个 python 实现的 Rustdesk API 接口，支持 WebUI 管理</i>
     <br/>
-    <img src ="https://img.shields.io/badge/Version-1.4.9-blueviolet.svg"/>
+    <img src ="https://img.shields.io/badge/Version-1.5.2-blueviolet.svg"/>
     <img src ="https://img.shields.io/badge/Python-3.7|3.8|3.9|3.10|3.11-blue.svg" />
     <img src ="https://img.shields.io/badge/Django-3.2+|4.x-yelow.svg" />
     <br/>
@@ -15,6 +14,30 @@
     <img src ="https://img.shields.io/badge/Docker-arm|arm64|amd64-blue.svg" />
 </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
+  - 根据自身需要来选择是否配置服务端的key参数。
+- rustdesk版本>1.2.3, 服务端请配合使用rustdesk-server>=1.1.11
+  - 当使用rustdesk-server自动生成的key时，会出现链接缓慢甚至链接超时。
+  - 解决办法：使用自定义k——配置rustdesk-server时，传入k参数来自定义key值，同时客户端同步配置相同的key，即可秒连。
+
+  - rustdesk-server的dock-compose配置参考：
+
+  ![demo](images/compose_demo.png)
+
+`key是保证别人不能在知道你中继服务器的IP后，利用你的IP做中继。如果不配置key，就做好中继IP的保密工作，不要泄露给其他人。
+而只要服务端配置了密钥，无论是随机生成（生成后本身就固定了），还是自定义的，如果控制客户端不配置对应key就无法控制其他机器（被控机器可以不填key）`
+
+对于自定义key是否生效，请看rustdesk server中`hbbs`的日志：
+![demo](images/key_activate.png)
+
+## 展示
+
 ![主页面](images/front_main.png)
 
 ## 功能特点
@@ -170,6 +193,10 @@ services:
 
   这种操作大概率是docker配置+nginx反代+SSL的组合，要注意修改CSRF_TRUSTED_ORIGINS，如果是ssl那就是https开头，否则就是http。
 
+- Mysql版本要求
+
+  如果你使用的是Mysql数据库，需要注意django4.x版本需要Mysql8.0，如果要使用mysql5.8则需要将django版本降至3.2。
+
 ## 开发计划
 
 - [x] 分享设备给其他已注册用户（v1.3+）
@@ -195,6 +222,11 @@ services:
 
 - [x] 支持mysql及sqlite3迁移mysql(1.4.8)。
 
+- [-] 用户前端修改密码。
+
+- [-] 前端改造，所有页面自适应，前后端分离(计划V2)。
+
+
 ## 其他相关工具
 
 - [可以修改客户端ID的CMD脚本](https://github.com/abdullah-erturk/RustDesk-ID-Changer)
@@ -205,3 +237,8 @@ services:
 
 ## Stargazers over time
 [![Stargazers over time](https://starchart.cc/kingmo888/rustdesk-api-server.svg?variant=adaptive)](https://starchart.cc/kingmo888/rustdesk-api-server)
+
+
+## 联络我
+
+![wechat](images/wechat.png)

README_EN.md

@@ -9,7 +9,7 @@
 <p align="center">
     <i>A Rustdesk API interface implemented in Python, with WebUI management support</i>
     <br/>
-    <img src ="https://img.shields.io/badge/Version-1.4.8-blueviolet.svg"/>
+    <img src ="https://img.shields.io/badge/Version-1.5.1-blueviolet.svg"/>
     <img src ="https://img.shields.io/badge/Python-3.7|3.8|3.9|3.10|3.11-blue.svg" />
     <img src ="https://img.shields.io/badge/Django-3.2+|4.x-yelow.svg" />
     <br/>

api/migrations/0008_rustdesdevice_ip_address.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.2 on 2024-09-09 10:37
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('api', '0007_alter_rustdesdevice_options_and_more'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='rustdesdevice',
+            name='ip_address',
+            field=models.CharField(blank=True, max_length=60, verbose_name='IP'),
+        ),
+    ]

api/models_work.py

@@ -3,6 +3,7 @@ from django.db import models
 from django.contrib import admin
 from django.utils.translation import gettext as _
 
+
 class RustDeskToken(models.Model):
     ''' Token
     '''
@@ -13,11 +14,13 @@ class RustDeskToken(models.Model):
     access_token = models.CharField(verbose_name=_('access_token'), max_length=60, blank=True)
     create_time = models.DateTimeField(verbose_name=_('登录时间'), auto_now_add=True)
     # expire_time = models.DateTimeField(verbose_name='过期时间')
+
     class Meta:
         ordering = ('-username',)
         verbose_name = "Token"
         verbose_name_plural = _("Token列表")
 
+
 class RustDeskTokenAdmin(admin.ModelAdmin):
     list_display = ('username', 'uid')
     search_fields = ('username', 'uid')
@@ -36,6 +39,7 @@ class RustDeskTag(models.Model):
         verbose_name = "Tags"
         verbose_name_plural = _("Tags列表")
 
+
 class RustDeskTagAdmin(admin.ModelAdmin):
     list_display = ('tag_name', 'uid', 'tag_color')
     search_fields = ('tag_name', 'uid')
@@ -75,6 +79,7 @@ class RustDesDevice(models.Model):
     uuid = models.CharField(verbose_name='uuid', max_length=100)
     username = models.CharField(verbose_name=_('系统用户名'), max_length=100, blank=True)
     version = models.CharField(verbose_name=_('客户端版本'), max_length=100)
+    ip_address = models.CharField(verbose_name=_('IP'), max_length=60, blank=True)
     create_time = models.DateTimeField(verbose_name=_('设备注册时间'), auto_now_add=True)
     update_time = models.DateTimeField(verbose_name=('设备更新时间'), auto_now=True, blank=True)
 
@@ -83,11 +88,13 @@ class RustDesDevice(models.Model):
         verbose_name = _("设备")
         verbose_name_plural = _("设备列表")
 
+
 class RustDesDeviceAdmin(admin.ModelAdmin):
     list_display = ('rid', 'hostname', 'memory', 'uuid', 'version', 'create_time', 'update_time')
     search_fields = ('hostname', 'memory')
     list_filter = ('rid', )
 
+
 class ConnLog(models.Model):
     id = models.IntegerField(verbose_name='ID', primary_key=True)
     action = models.CharField(verbose_name='Action', max_length=20, null=True)
@@ -100,11 +107,13 @@ class ConnLog(models.Model):
     session_id = models.CharField(verbose_name='Session ID', max_length=60, null=True)
     uuid = models.CharField(verbose_name='uuid', max_length=60, null=True)
 
+
 class ConnLogAdmin(admin.ModelAdmin):
     list_display = ('id', 'action', 'conn_id', 'from_ip', 'from_id', 'rid', 'conn_start', 'conn_end', 'session_id', 'uuid')
     search_fields = ('from_ip', 'rid')
     list_filter = ('id', 'from_ip', 'from_id', 'rid', 'conn_start', 'conn_end')
 
+
 class FileLog(models.Model):
     id = models.IntegerField(verbose_name='ID', primary_key=True)
     file = models.CharField(verbose_name='Path', max_length=500)
@@ -115,11 +124,13 @@ class FileLog(models.Model):
     direction = models.IntegerField(verbose_name='Direction', default=0)
     logged_at = models.DateTimeField(verbose_name='Logged At', null=True)
 
+
 class FileLogAdmin(admin.ModelAdmin):
     list_display = ('id', 'file', 'remote_id', 'user_id', 'user_ip', 'filesize', 'direction', 'logged_at')
     search_fields = ('file', 'remote_id', 'user_id', 'user_ip')
     list_filter = ('id', 'file', 'remote_id', 'user_id', 'user_ip', 'filesize', 'direction', 'logged_at')
 
+
 class ShareLink(models.Model):
     ''' 分享链接
     '''
@@ -130,8 +141,6 @@ class ShareLink(models.Model):
     is_expired = models.BooleanField(verbose_name=_('是否过期'), default=False)
     create_time = models.DateTimeField(verbose_name=_('生成时间'), auto_now_add=True)
 
-
-    
     class Meta:
         ordering = ('-create_time',)
         verbose_name = _("分享链接")

api/templates/base.html

@@ -37,10 +37,14 @@
         <li class="layui-nav-item"><a href="/webui" target="_blank">{% trans "网页控制" %}</a></li>
 
         {% if u.is_admin %}
-        <li class="layui-nav-item"><a href="/api/conn_log">{% trans "连接日志" %}</a></li>
+        <li class="layui-nav-item">
-        <li class="layui-nav-item"><a href="/api/file_log">{% trans "文件传输日志" %}</a></li>
+            <a href="">{% trans "日志" %}</a>
-        <li class="layui-nav-item"><a href="/admin" target="_blank">{% trans "管理后台" %}</a>
+            <dl class="layui-nav-child">
+                <dd><a href="/api/conn_log">{% trans "连接日志" %}</a></dd>
+                <dd><a href="/api/file_log">{% trans "文件传输日志" %}</a></dd>
+            </dl>
         </li>
+        <li class="layui-nav-item"><a href="/admin" target="_blank">{% trans "管理后台" %}</a></li>
         {% endif %}
         <li class="layui-nav-item"><a href="/api/user_action?action=logout" target="_blank">{% trans "退出" %}</a></li>
     </ul>

api/templates/show_work.html

@@ -23,6 +23,7 @@
                 <th>{{ "系统" | translate }}</th>
                 <th>{{ "CPU" | translate }}</th>
                 <th>{{ "内存" | translate }}</th>
+                <th>{{ "IP" | translate }}</th>
                 <th>{{ "注册时间" | translate }}</th>
                 <th>{{ "更新时间" | translate }}</th>
                 <th>{{ "状态" | translate }}</th>
@@ -41,6 +42,7 @@
                 <td>{{one.os}}</td>
                 <td>{{one.cpu}}</td>
                 <td>{{one.memory}}</td>
+                <td>{{one.ip_address}}</td>
                 <td>{{one.create_time}}</td>
                 <td>{{one.update_time}}</td>
                 <td>{{one.status}} </td>
@@ -89,6 +91,7 @@
                 <th>{{ "系统" | translate }}</th>
                 <th>{{ "CPU" | translate }}</th>
                 <th>{{ "内存" | translate }}</th>
+                <th>{{ "IP" | translate }}</th>
                 <th>{{ "注册日期" | translate }}</th>
                 <th>{{ "更新时间" | translate }}</th>
                 <th>{{ "状态" | translate }}</th>
@@ -106,6 +109,7 @@
                 <td>{{one.os}} </td>
                 <td>{{one.cpu}} </td>
                 <td>{{one.memory}} </td>
+                <td>{{one.ip_address}}</td>
                 <td>{{one.create_time}} </td>
                 <td>{{one.update_time}} </td>
                 <td>{{one.status}} </td>

api/views_api.py

@@ -3,10 +3,10 @@ from django.http import JsonResponse
 import json
 import time
 import datetime
-import hashlib
+# import hashlib
 import math
 from django.contrib import auth
-from django.forms.models import model_to_dict
+# from django.forms.models import model_to_dict
 from api.models import RustDeskToken, UserProfile, RustDeskTag, RustDeskPeer, RustDesDevice, ConnLog, FileLog
 from django.db.models import Q
 import copy
@@ -14,6 +14,15 @@ 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':
@@ -39,6 +48,18 @@ def login(request):
     user.rtype = rtype
     user.deviceInfo = json.dumps(deviceInfo)
     user.save()
+    # 绑定设备  20240819
+    peer = RustDeskPeer.objects.filter(Q(rid=rid)).first()
+    if not peer:
+        device = RustDesDevice.objects.filter(Q(uuid=uuid)).first()
+        if device:
+            peer = RustDeskPeer()
+            peer.uid = user.id
+            peer.rid = device.rid
+            # peer.abid = ab.guid    # v2,  current version not used
+            peer.hostname = device.hostname
+            peer.username = device.username
+            peer.save()
 
     token = RustDeskToken.objects.filter(Q(uid=user.id) & Q(username=user.username) & Q(rid=user.rid)).first()
 
@@ -92,9 +113,9 @@ def currentUser(request):
     if request.method == 'GET':
         result['error'] = _('错误的提交方式！')
         return JsonResponse(result)
-    postdata = json.loads(request.body)
+    # postdata = json.loads(request.body)
-    rid = postdata.get('id', '')
+    # rid = postdata.get('id', '')
-    uuid = postdata.get('uuid', '')
+    # uuid = postdata.get('uuid', '')
 
     access_token = request.META.get('HTTP_AUTHORIZATION', '')
     access_token = access_token.split('Bearer ')[-1]
@@ -201,18 +222,20 @@ def ab(request):
     }
     return JsonResponse(result)
 
+
 def ab_get(request):
     # 兼容 x86-sciter 版客户端，此版客户端通过访问 "POST /api/ab/get" 来获取地址簿
     request.method = 'GET'
     return ab(request)
 
+
 def sysinfo(request):
     # 客户端注册服务后，才会发送设备信息
     result = {}
     if request.method == 'GET':
         result['error'] = _('错误的提交方式！')
         return JsonResponse(result)
-    
+    client_ip = get_client_ip(request)
     postdata = json.loads(request.body)
     device = RustDesDevice.objects.filter(Q(rid=postdata['id']) & Q(uuid=postdata['uuid'])).first()
     if not device:
@@ -225,6 +248,7 @@ def sysinfo(request):
             username=postdata.get('username', '-'),
             uuid=postdata['uuid'],
             version=postdata['version'],
+            ip_address=client_ip
         )
         device.save()
     else:
@@ -235,10 +259,13 @@ def sysinfo(request):
     result['data'] = 'ok'
     return JsonResponse(result)
 
+
 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)
+        device.ip_address = client_ip
         device.save()
     # token保活
     create_time = datetime.datetime.now() + datetime.timedelta(seconds=EFFECTIVE_SECONDS)
@@ -247,6 +274,7 @@ def heartbeat(request):
     result['data'] = _('在线')
     return JsonResponse(result)
 
+
 def audit(request):
     postdata = json.loads(request.body)
     # print(postdata)
@@ -284,8 +312,8 @@ def audit(request):
             peer = postdata['peer']
             ConnLog.objects.filter(Q(conn_id=postdata['conn_id'])).update(session_id=postdata['session_id'])
             ConnLog.objects.filter(Q(conn_id=postdata['conn_id'])).update(from_id=peer[0])
-        except:
+        except Exception as e:
-            print(postdata)
+            print(postdata, e)
 
     result = {
         'code': 1,
@@ -293,6 +321,7 @@ def audit(request):
     }
     return JsonResponse(result)
 
+
 def convert_filesize(size_bytes):
     if size_bytes == 0:
         return "0B"
@@ -302,6 +331,7 @@ def convert_filesize(size_bytes):
     s = round(size_bytes / p, 2)
     return "%s %s" % (s, size_name[i])
 
+
 def users(request):
     result = {
         'code': 1,
@@ -309,6 +339,7 @@ def users(request):
     }
     return JsonResponse(result)
 
+
 def peers(request):
     result = {
         'code': 1,

api/views_front.py

@@ -28,6 +28,7 @@ from django.utils.translation import gettext as _
 salt = 'xiaomo'
 EFFECTIVE_SECONDS = 7200
 
+
 def getStrMd5(s):
     if not isinstance(s, (str,)):
         s = str(s)
@@ -37,6 +38,7 @@ def getStrMd5(s):
 
     return myHash.hexdigest()
 
+
 def model_to_dict2(instance, fields=None, exclude=None, replace=None, default=None):
     """
     :params instance: 模型对象，不能是queryset数据集
@@ -49,21 +51,21 @@ def model_to_dict2(instance, fields=None, exclude=None, replace=None, default=No
     if not isinstance(instance, Model):
         raise Exception(_('model_to_dict接收的参数必须是模型对象'))
     # 对替换数据库字段名字校验
-    if replace and type(replace) == dict:
+    if replace and type(replace) == dict:   # noqa
         for replace_field in replace.values():
             if hasattr(instance, replace_field):
                 raise Exception(_(f'model_to_dict,要替换成{replace_field}字段已经存在了'))
     # 对要新增的默认值进行校验
-    if default and type(default) == dict:
+    if default and type(default) == dict:   # noqa
         for default_key in default.keys():
             if hasattr(instance, default_key):
-                raise Exception(_(f'model_to_dict,要新增默认值，但字段{default_key}已经存在了'))
+                raise Exception(_(f'model_to_dict,要新增默认值，但字段{default_key}已经存在了'))  # noqa
     opts = instance._meta
     data = {}
     for f in chain(opts.concrete_fields, opts.private_fields, opts.many_to_many):
         # 源码下：这块代码会将时间字段剔除掉，我加上一层判断，让其不再剔除时间字段
         if not getattr(f, 'editable', False):
-            if type(f) == DateField or type(f) == DateTimeField:
+            if type(f) == DateField or type(f) == DateTimeField:   # noqa
                 pass
             else:
                 continue
@@ -76,20 +78,20 @@ def model_to_dict2(instance, fields=None, exclude=None, replace=None, default=No
 
         key = f.name
         # 获取字段对应的数据
-        if type(f) == DateTimeField:
+        if type(f) == DateTimeField:   # noqa
             # 字段类型是，DateTimeFiled 使用自己的方式操作
             value = getattr(instance, key)
             value = datetime.datetime.strftime(value, '%Y-%m-%d %H:%M')
-        elif type(f) == DateField:
+        elif type(f) == DateField:   # noqa
             # 字段类型是，DateFiled 使用自己的方式操作
             value = getattr(instance, key)
             value = datetime.datetime.strftime(value, '%Y-%m-%d')
-        elif type(f) == CharField or type(f) == TextField:
+        elif type(f) == CharField or type(f) == TextField:   # noqa
             # 字符串数据是否可以进行序列化，转成python结构数据
             value = getattr(instance, key)
             try:
                 value = json.loads(value)
-            except Exception as _:
+            except Exception as _:  # noqa
                 value = value
         else:  # 其他类型的字段
             # value = getattr(instance, key)
@@ -124,6 +126,7 @@ def user_action(request):
     else:
         return
 
+
 def user_login(request):
     if request.method == 'GET':
         return render(request, 'login.html')
@@ -140,6 +143,7 @@ def user_login(request):
     else:
         return JsonResponse({'code': 0, 'msg': _('帐号或密码错误！')})
 
+
 def user_register(request):
     info = ''
     if request.method == 'GET':
@@ -183,12 +187,14 @@ def user_register(request):
     result['code'] = 1
     return JsonResponse(result)
 
+
 @login_required(login_url='/api/user_action?action=login')
 def user_logout(request):
-    info = ''
+    # info=''
     auth.logout(request)
     return HttpResponseRedirect('/api/user_action?action=login')
 
+
 def get_single_info(uid):
     peers = RustDeskPeer.objects.filter(Q(uid=uid))
     rids = [x.rid for x in peers]
@@ -211,6 +217,7 @@ def get_single_info(uid):
 
     return [v for k, v in peers.items()]
 
+
 def get_all_info():
     devices = RustDesDevice.objects.all()
     peers = RustDeskPeer.objects.all()
@@ -222,10 +229,14 @@ 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()]
 
+
 @login_required(login_url='/api/user_action?action=login')
 def work(request):
     username = request.user
@@ -238,6 +249,7 @@ def work(request):
     page_obj = paginator.get_page(page_number)
     return render(request, 'show_work.html', {'u': u, 'show_all': show_all, 'page_obj': page_obj})
 
+
 @login_required(login_url='/api/user_action?action=login')
 def down_peers(request):
     username = request.user
@@ -267,6 +279,7 @@ def down_peers(request):
     response.write(sio.getvalue())
     return response
 
+
 def check_sharelink_expired(sharelink):
     now = datetime.datetime.now()
     if sharelink.create_time > now:
@@ -284,9 +297,8 @@ def share(request):
     peers = RustDeskPeer.objects.filter(Q(uid=request.user.id))
     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))
@@ -318,7 +330,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:
@@ -369,12 +381,12 @@ def get_conn_log():
         try:
             peer = RustDeskPeer.objects.get(rid=v['rid'])
             logs[k]['alias'] = peer.alias
-        except:
+        except: # noqa
             logs[k]['alias'] = _('UNKNOWN')
         try:
             peer = RustDeskPeer.objects.get(rid=v['from_id'])
             logs[k]['from_alias'] = peer.alias
-        except:
+        except: # noqa
             logs[k]['from_alias'] = _('UNKNOWN')
         # from_zone = tz.tzutc()
         # to_zone = tz.tzlocal()
@@ -387,7 +399,7 @@ def get_conn_log():
             h, m = divmod(m, 60)
             # d, h = divmod(h, 24)
             logs[k]['duration'] = f'{h:02d}:{m:02d}:{s:02d}'
-        except:
+        except:   # noqa
             logs[k]['duration'] = -1
 
     sorted_logs = sorted(logs.items(), key=lambda x: x[1]['conn_start'], reverse=True)
@@ -397,6 +409,7 @@ def get_conn_log():
 
     return [v for k, v in new_ordered_dict.items()]
 
+
 def get_file_log():
     logs = FileLog.objects.all()
     logs = {x.id: model_to_dict(x) for x in logs}
@@ -405,12 +418,12 @@ def get_file_log():
         try:
             peer_remote = RustDeskPeer.objects.get(rid=v['remote_id'])
             logs[k]['remote_alias'] = peer_remote.alias
-        except:
+        except:   # noqa
             logs[k]['remote_alias'] = _('UNKNOWN')
         try:
             peer_user = RustDeskPeer.objects.get(rid=v['user_id'])
             logs[k]['user_alias'] = peer_user.alias
-        except:
+        except:   # noqa
             logs[k]['user_alias'] = _('UNKNOWN')
 
     sorted_logs = sorted(logs.items(), key=lambda x: x[1]['logged_at'], reverse=True)
@@ -420,6 +433,7 @@ def get_file_log():
 
     return [v for k, v in new_ordered_dict.items()]
 
+
 @login_required(login_url='/api/user_action?action=login')
 def conn_log(request):
     paginator = Paginator(get_conn_log(), 20)
@@ -427,6 +441,7 @@ def conn_log(request):
     page_obj = paginator.get_page(page_number)
     return render(request, 'show_conn_log.html', {'page_obj': page_obj})
 
+
 @login_required(login_url='/api/user_action?action=login')
 def file_log(request):
     paginator = Paginator(get_file_log(), 20)

requirements.txt

@@ -1,2 +1,3 @@
 django
 xlwt
+mysqlclient

rustdesk_server_api/settings.py

@@ -32,7 +32,9 @@ DEFAULT_AUTO_FIELD = 'django.db.models.AutoField'
 ALLOWED_HOSTS = ["*"]
 AUTH_USER_MODEL = 'api.UserProfile'      # AppName.自定义user
 
-ALLOW_REGISTRATION = os.environ.get("ALLOW_REGISTRATION", "True") or os.environ.get("ALLOW_REGISTRATION", "True") == "True"               # 是否允许注册, True为允许，False为不允许
+ALLOW_REGISTRATION = os.environ.get("ALLOW_REGISTRATION", "True")          # 是否允许注册, True为允许，False为不允许
+ALLOW_REGISTRATION = True if ALLOW_REGISTRATION.lower() == 'true' else False
+
 
 # ==========数据库配置 开始=====================
 DATABASE_TYPE = os.environ.get("DATABASE_TYPE", 'SQLITE')
@@ -159,8 +161,6 @@ if DEBUG:
     STATICFILES_DIRS = [os.path.join(BASE_DIR, 'static')]
 
 else:
-
-
     STATIC_ROOT = os.path.join(BASE_DIR, 'static')     # 新增
 
 LANGUAGES = (