更新说明

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"}'

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.5.0-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,7 +14,31 @@
     <img src ="https://img.shields.io/badge/Docker-arm|arm64|amd64-blue.svg" />
 </p>
 
-![主页面](images/front_main.png) 
+# 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)
 
 ## 功能特点
 
@@ -169,7 +192,7 @@ services:
 - 后台操作登录或登出时：CSRF验证失败. 请求被中断.
 
   这种操作大概率是docker配置+nginx反代+SSL的组合，要注意修改CSRF_TRUSTED_ORIGINS，如果是ssl那就是https开头，否则就是http。
-  
+
 - Mysql版本要求
 
   如果你使用的是Mysql数据库，需要注意django4.x版本需要Mysql8.0，如果要使用mysql5.8则需要将django版本降至3.2。
@@ -184,7 +207,7 @@ services:
 - [x] 集成Web客户端形式（v1.4+）
 
   > 将大神的web客户端集成进来，已集成。 [来源](https://www.52pojie.cn/thread-1708319-1-1.html)
-  
+
 - [x] 对过期（不在线）设备的过滤，用以区分在线&离线设备(1.4.7)
 
   > 通过配置方式，对过期超过指定时间的设备清理或过滤。
@@ -199,6 +222,11 @@ services:
 
 - [x] 支持mysql及sqlite3迁移mysql(1.4.8)。
 
+- [-] 用户前端修改密码。
+
+- [-] 前端改造，所有页面自适应，前后端分离(计划V2)。
+
+
 ## 其他相关工具
 
 - [可以修改客户端ID的CMD脚本](https://github.com/abdullah-erturk/RustDesk-ID-Changer)
@@ -209,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.5.0-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
     '''
@@ -12,17 +13,19 @@ class RustDeskToken(models.Model):
     uuid = models.CharField(verbose_name=_('uuid'), max_length=60)
     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='过期时间')
+    # expire_time = models.DateTimeField(verbose_name='过期时间')
+
     class Meta:
         ordering = ('-username',)
         verbose_name = "Token"
-        verbose_name_plural = _("Token列表") 
+        verbose_name_plural = _("Token列表")
+
 
 class RustDeskTokenAdmin(admin.ModelAdmin):
     list_display = ('username', 'uid')
     search_fields = ('username', 'uid')
-    list_filter = ('create_time', ) #过滤器
+    list_filter = ('create_time', )  # 过滤器
-    
+
 
 class RustDeskTag(models.Model):
     ''' Tags
@@ -30,17 +33,18 @@ class RustDeskTag(models.Model):
     uid = models.CharField(verbose_name=_('所属用户ID'), max_length=16)
     tag_name = models.CharField(verbose_name=_('标签名称'), max_length=60)
     tag_color = models.CharField(verbose_name=_('标签颜色'), max_length=60, blank=True)
-    
+
     class Meta:
         ordering = ('-uid',)
         verbose_name = "Tags"
         verbose_name_plural = _("Tags列表")
 
+
 class RustDeskTagAdmin(admin.ModelAdmin):
     list_display = ('tag_name', 'uid', 'tag_color')
     search_fields = ('tag_name', 'uid')
     list_filter = ('uid', )
-    
+
 
 class RustDeskPeer(models.Model):
     ''' Pees
@@ -53,19 +57,19 @@ class RustDeskPeer(models.Model):
     platform = models.CharField(verbose_name=_('平台'), max_length=30)
     tags = models.CharField(verbose_name=_('标签'), max_length=30)
     rhash = models.CharField(verbose_name=_('设备链接密码'), max_length=60)
-    
+
     class Meta:
         ordering = ('-username',)
         verbose_name = "Peers"
-        verbose_name_plural = _("Peers列表" )
+        verbose_name_plural = _("Peers列表")
-        
+
 
 class RustDeskPeerAdmin(admin.ModelAdmin):
     list_display = ('rid', 'uid', 'username', 'hostname', 'platform', 'alias', 'tags')
     search_fields = ('deviceid', 'alias')
     list_filter = ('rid', 'uid', )
-    
+
-    
+
 class RustDesDevice(models.Model):
     rid = models.CharField(verbose_name=_('客户端ID'), max_length=60, blank=True)
     cpu = models.CharField(verbose_name='CPU', max_length=100)
@@ -75,21 +79,24 @@ 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)
-    
+
     class Meta:
         ordering = ('-rid',)
         verbose_name = _("设备")
-        verbose_name_plural = _("设备列表" )
+        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)
+    id = models.IntegerField(verbose_name='ID', primary_key=True)
     action = models.CharField(verbose_name='Action', max_length=20, null=True)
     conn_id = models.CharField(verbose_name='Connection ID', max_length=10, null=True)
     from_ip = models.CharField(verbose_name='From IP', max_length=30, null=True)
@@ -100,13 +107,15 @@ 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)
+    id = models.IntegerField(verbose_name='ID', primary_key=True)
     file = models.CharField(verbose_name='Path', max_length=500)
     remote_id = models.CharField(verbose_name='Remote ID', max_length=20, default='0')
     user_id = models.CharField(verbose_name='User ID', max_length=20, default='0')
@@ -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):
     ''' 分享链接
     '''
@@ -129,16 +140,14 @@ class ShareLink(models.Model):
     is_used = models.BooleanField(verbose_name=_('是否使用'), default=False)
     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 = _("分享链接")
-        verbose_name_plural = _("链接列表" )
+        verbose_name_plural = _("链接列表")
-        
+
 
 class ShareLinkAdmin(admin.ModelAdmin):
     list_display = ('shash', 'uid', 'peers', 'is_used', 'is_expired', 'create_time')
     search_fields = ('peers', )
-    list_filter = ('is_used', 'uid', 'is_expired' )
+    list_filter = ('is_used', 'uid', 'is_expired')

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>
@@ -67,10 +69,10 @@
               <button class="layui-btn" ><a href="?page={{ page_obj.paginator.num_pages }}">{{ "尾页" | translate }} &raquo;</a></button>
           {% endif %}
       </span>
-  </div>  
+  </div>
     {% endif %}
 
-    
+
     {% if u.is_admin and show_all %}
     <div class="layui-col-md15">
       <div class="layui-card">
@@ -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>
@@ -132,11 +136,11 @@
               <button class="layui-btn" ><a href="?show_type=admin&page={{ page_obj.paginator.num_pages }}">{{ "尾页" | translate }} &raquo;</a></button>
           {% endif %}
       </span>
-  </div>  
+  </div>
     {% endif %}
 
- 
+
-  
+
 
   </div>
 </div>

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':
@@ -21,7 +30,7 @@ def login(request):
         return JsonResponse(result)
 
     data = json.loads(request.body.decode())
-    
+
     username = data.get('username', '')
     password = data.get('password', '')
     rid = data.get('id', '')
@@ -29,19 +38,31 @@ def login(request):
     autoLogin = data.get('autoLogin', True)
     rtype = data.get('type', '')
     deviceInfo = data.get('deviceInfo', '')
-    user = auth.authenticate(username=username,password=password)
+    user = auth.authenticate(username=username, password=password)
     if not user:
         result['error'] = _('帐号或密码错误！请重试，多次重试后将被锁定IP！')
         return JsonResponse(result)
     user.rid = rid
     user.uuid = uuid
     user.autoLogin = autoLogin
-    user.rtype = rtype 
+    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()
-    
+
     # 检查是否过期
     if token:
         now_t = datetime.datetime.now()
@@ -49,7 +70,7 @@ def login(request):
         if nums >= EFFECTIVE_SECONDS:
             token.delete()
             token = None
-    
+
     if not token:
         # 获取并保存token
         token = RustDeskToken(
@@ -57,33 +78,33 @@ def login(request):
             uid=user.id,
             uuid=user.uuid,
             rid=user.rid,
-            access_token=getStrMd5(str(time.time())+salt)
+            access_token=getStrMd5(str(time.time()) + salt)
         )
         token.save()
 
     result['access_token'] = token.access_token
     result['type'] = 'access_token'
-    result['user'] = {'name':user.username}
+    result['user'] = {'name': user.username}
     return JsonResponse(result)
 
 
 def logout(request):
     if request.method == 'GET':
-        result = {'error':_('请求方式错误！')}
+        result = {'error': _('请求方式错误！')}
         return JsonResponse(result)
-    
+
     data = json.loads(request.body.decode())
     rid = data.get('id', '')
     uuid = data.get('uuid', '')
     user = UserProfile.objects.filter(Q(rid=rid) & Q(uuid=uuid)).first()
     if not user:
-        result = {'error':_('异常请求！')}
+        result = {'error': _('异常请求！')}
         return JsonResponse(result)
     token = RustDeskToken.objects.filter(Q(uid=user.id) & Q(rid=user.rid)).first()
     if token:
         token.delete()
 
-    result = {'code':1}
+    result = {'code': 1}
     return JsonResponse(result)
 
 
@@ -92,17 +113,17 @@ 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]
-    token = RustDeskToken.objects.filter(Q(access_token=access_token) ).first()
+    token = RustDeskToken.objects.filter(Q(access_token=access_token)).first()
     user = None
     if token:
         user = UserProfile.objects.filter(Q(id=token.uid)).first()
-    
+
     if user:
         if token:
             result['access_token'] = token.access_token
@@ -116,53 +137,53 @@ def ab(request):
     '''
     access_token = request.META.get('HTTP_AUTHORIZATION', '')
     access_token = access_token.split('Bearer ')[-1]
-    token = RustDeskToken.objects.filter(Q(access_token=access_token) ).first()
+    token = RustDeskToken.objects.filter(Q(access_token=access_token)).first()
     if not token:
-        result = {'error':_('拉取列表错误！')}
+        result = {'error': _('拉取列表错误！')}
         return JsonResponse(result)
-    
+
     if request.method == 'GET':
         result = {}
         uid = token.uid
-        tags = RustDeskTag.objects.filter(Q(uid=uid) )
+        tags = RustDeskTag.objects.filter(Q(uid=uid))
         tag_names = []
         tag_colors = {}
         if tags:
             tag_names = [str(x.tag_name) for x in tags]
-            tag_colors = {str(x.tag_name):int(x.tag_color) for x in tags if x.tag_color!=''}
+            tag_colors = {str(x.tag_name): int(x.tag_color) for x in tags if x.tag_color != ''}
-        
+
         peers_result = []
-        peers = RustDeskPeer.objects.filter(Q(uid=uid) )
+        peers = RustDeskPeer.objects.filter(Q(uid=uid))
         if peers:
             for peer in peers:
                 tmp = {
-                    'id':peer.rid,
+                    'id': peer.rid,
-                    'username':peer.username,
+                    'username': peer.username,
-                    'hostname':peer.hostname,
+                    'hostname': peer.hostname,
-                    'alias':peer.alias,
+                    'alias': peer.alias,
-                    'platform':peer.platform,
+                    'platform': peer.platform,
-                    'tags':peer.tags.split(','),
+                    'tags': peer.tags.split(','),
-                    'hash':peer.rhash,
+                    'hash': peer.rhash,
                 }
                 peers_result.append(tmp)
-        
+
         result['updated_at'] = datetime.datetime.now()
         result['data'] = {
-            'tags':tag_names,
+            'tags': tag_names,
-            'peers':peers_result,
+            'peers': peers_result,
-            'tag_colors':json.dumps(tag_colors)
+            'tag_colors': json.dumps(tag_colors)
         }
         result['data'] = json.dumps(result['data'])
         return JsonResponse(result)
     else:
         postdata = json.loads(request.body.decode())
         data = postdata.get('data', '')
-        data = {} if data=='' else json.loads(data)
+        data = {} if data == '' else json.loads(data)
         tagnames = data.get('tags', [])
         tag_colors = data.get('tag_colors', '')
-        tag_colors = {} if tag_colors=='' else json.loads(tag_colors)
+        tag_colors = {} if tag_colors == '' else json.loads(tag_colors)
         peers = data.get('peers', [])
-        
+
         if tagnames:
             # 删除旧的tag
             RustDeskTag.objects.filter(uid=token.uid).delete()
@@ -189,32 +210,34 @@ def ab(request):
                     platform=one['platform'],
                     tags=','.join(one['tags']),
                     rhash=one['hash'],
-                    
+
-                    
+
                 )
                 newlist.append(peer)
             RustDeskPeer.objects.bulk_create(newlist)
 
     result = {
-    'code':102,
+        'code': 102,
-    'data':_('更新地址簿有误')
+        'data': _('更新地址簿有误')
     }
     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()
+    device = RustDesDevice.objects.filter(Q(rid=postdata['id']) & Q(uuid=postdata['uuid'])).first()
     if not device:
         device = RustDesDevice(
             rid=postdata['id'],
@@ -225,31 +248,36 @@ def sysinfo(request):
             username=postdata.get('username', '-'),
             uuid=postdata['uuid'],
             version=postdata['version'],
+            ip_address=client_ip
         )
         device.save()
     else:
         postdata2 = copy.copy(postdata)
         postdata2['rid'] = postdata2['id']
         postdata2.pop('id')
-        RustDesDevice.objects.filter(Q(rid=postdata['id']) & Q(uuid=postdata['uuid']) ).update(**postdata2)
+        RustDesDevice.objects.filter(Q(rid=postdata['id']) & Q(uuid=postdata['uuid'])).update(**postdata2)
     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()
+    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)
-    RustDeskToken.objects.filter(Q(rid=postdata['id']) & Q(uuid=postdata['uuid']) ).update(create_time=create_time)
+    RustDeskToken.objects.filter(Q(rid=postdata['id']) & Q(uuid=postdata['uuid'])).update(create_time=create_time)
     result = {}
     result['data'] = _('在线')
     return JsonResponse(result)
 
+
 def audit(request):
     postdata = json.loads(request.body)
-    #print(postdata)
+    # print(postdata)
     audit_type = postdata['action'] if 'action' in postdata else ''
     if audit_type == 'new':
         new_conn_log = ConnLog(
@@ -263,7 +291,7 @@ def audit(request):
             uuid=postdata['uuid'] if 'uuid' in postdata else '',
         )
         new_conn_log.save()
-    elif audit_type =="close":
+    elif audit_type == "close":
         ConnLog.objects.filter(Q(conn_id=postdata['conn_id'])).update(conn_end=datetime.datetime.now())
     elif 'is_file' in postdata:
         print(postdata)
@@ -284,15 +312,16 @@ 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,
+        'code': 1,
-    'data':'ok'
+        'data': 'ok'
     }
     return JsonResponse(result)
 
+
 def convert_filesize(size_bytes):
     if size_bytes == 0:
         return "0B"
@@ -301,17 +330,19 @@ def convert_filesize(size_bytes):
     p = math.pow(1024, i)
     s = round(size_bytes / p, 2)
     return "%s %s" % (s, size_name[i])
-    
+
+
 def users(request):
     result = {
-    'code':1,
+        'code': 1,
-    'data':_('好的')
+        'data': _('好的')
     }
     return JsonResponse(result)
-    
+
+
 def peers(request):
     result = {
-    'code':1,
+        'code': 1,
-    'data':'ok'
+        'data': 'ok'
     }
-    return JsonResponse(result)
+    return JsonResponse(result)

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,22 +78,22 @@ 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:#其他类型的字段
+        else:  # 其他类型的字段
             # value = getattr(instance, key)
             key = f.name
             value = f.value_from_object(instance)
@@ -100,15 +102,15 @@ def model_to_dict2(instance, fields=None, exclude=None, replace=None, default=No
         if replace and key in replace.keys():
             key = replace.get(key)
         data[key] = value
-    #2、新增默认的字段数据
+    # 2、新增默认的字段数据
     if default:
         data.update(default)
     return data
 
 
 def index(request):
-    print('sdf',sys.argv)
+    print('sdf', sys.argv)
-    if request.user and request.user.username!='AnonymousUser':
+    if request.user and request.user.username != 'AnonymousUser':
         return HttpResponseRedirect('/api/work')
     return HttpResponseRedirect('/api/user_action?action=login')
 
@@ -124,6 +126,7 @@ def user_action(request):
     else:
         return
 
+
 def user_login(request):
     if request.method == 'GET':
         return render(request, 'login.html')
@@ -131,14 +134,15 @@ def user_login(request):
     username = request.POST.get('account', '')
     password = request.POST.get('password', '')
     if not username or not password:
-        return JsonResponse({'code':0, 'msg':_('出了点问题，未获取用户名或密码。')})
+        return JsonResponse({'code': 0, 'msg': _('出了点问题，未获取用户名或密码。')})
 
-    user = auth.authenticate(username=username,password=password)
+    user = auth.authenticate(username=username, password=password)
     if user:
         auth.login(request, user)
-        return JsonResponse({'code':1, 'url':'/api/work'})
+        return JsonResponse({'code': 1, 'url': '/api/work'})
     else:
-        return JsonResponse({'code':0, 'msg':_('帐号或密码错误！')})
+        return JsonResponse({'code': 0, 'msg': _('帐号或密码错误！')})
+
 
 def user_register(request):
     info = ''
@@ -146,8 +150,8 @@ def user_register(request):
         return render(request, 'reg.html')
     ALLOW_REGISTRATION = settings.ALLOW_REGISTRATION
     result = {
-        'code':0,
+        'code': 0,
-        'msg':''
+        'msg': ''
     }
     if not ALLOW_REGISTRATION:
         result['msg'] = _('当前未开放注册，请联系管理员！')
@@ -161,7 +165,7 @@ def user_register(request):
         result['msg'] = info
         return JsonResponse(result)
 
-    if len(password1)<8 or len(password1)>20:
+    if len(password1) < 8 or len(password1) > 20:
         info = _('密码长度不符合要求, 应在8~20位。')
         result['msg'] = info
         return JsonResponse(result)
@@ -174,28 +178,30 @@ def user_register(request):
     user = UserProfile(
         username=username,
         password=make_password(password1),
-        is_admin = True if UserProfile.objects.count()==0 else False,
+        is_admin=True if UserProfile.objects.count() == 0 else False,
-        is_superuser = True if UserProfile.objects.count()==0 else False,
+        is_superuser=True if UserProfile.objects.count() == 0 else False,
-        is_active = True
+        is_active=True
     )
     user.save()
     result['msg'] = info
     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]
-    peers = {x.rid:model_to_dict(x) for x in peers}
+    peers = {x.rid: model_to_dict(x) for x in peers}
-    #print(peers)
+    # print(peers)
     devices = RustDesDevice.objects.filter(rid__in=rids)
-    devices = {x.rid:x for x in devices}
+    devices = {x.rid: x for x in devices}
     now = datetime.datetime.now()
     for rid, device in devices.items():
         peers[rid]['create_time'] = device.create_time.strftime('%Y-%m-%d')
@@ -204,39 +210,45 @@ def get_single_info(uid):
         peers[rid]['memory'] = device.memory
         peers[rid]['cpu'] = device.cpu
         peers[rid]['os'] = device.os
-        peers[rid]['status'] = _('在线') if (now-device.update_time).seconds <=120 else _('离线')
+        peers[rid]['status'] = _('在线') if (now - device.update_time).seconds <= 120 else _('离线')
 
     for rid in peers.keys():
-        peers[rid]['has_rhash'] = _('是') if len(peers[rid]['rhash'])>1 else _('否')
+        peers[rid]['has_rhash'] = _('是') if len(peers[rid]['rhash']) > 1 else _('否')
+
+    return [v for k, v in peers.items()]
 
-    return [v for k,v in peers.items()]
 
 def get_all_info():
     devices = RustDesDevice.objects.all()
     peers = RustDeskPeer.objects.all()
-    devices = {x.rid:model_to_dict2(x) for x in devices}
+    devices = {x.rid: model_to_dict2(x) for x in devices}
     now = datetime.datetime.now()
     for peer in peers:
         user = UserProfile.objects.filter(Q(id=peer.uid)).first()
         device = devices.get(peer.rid, None)
         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 _('离线')
+        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()]
+    return [v for k, v in devices.items()]
+
 
 @login_required(login_url='/api/user_action?action=login')
 def work(request):
     username = request.user
     u = UserProfile.objects.get(username=username)
-    
+
     show_type = request.GET.get('show_type', '')
     show_all = True if show_type == 'admin' and u.is_admin else False
     paginator = Paginator(get_all_info(), 15) if show_type == 'admin' and u.is_admin else Paginator(get_single_info(u.id), 15)
     page_number = request.GET.get('page')
     page_obj = paginator.get_page(page_number)
-    return render(request, 'show_work.html', {'u':u, 'show_all':show_all, 'page_obj':page_obj})
+    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):
@@ -246,7 +258,7 @@ def down_peers(request):
     if not u.is_admin:
         print(u.is_admin)
         return HttpResponseRedirect('/api/work')
-    
+
     all_info = get_all_info()
     f = xlwt.Workbook(encoding='utf-8')
     sheet1 = f.add_sheet(_(u'设备信息表'), cell_overwrite_ok=True)
@@ -257,7 +269,7 @@ def down_peers(request):
             if i == 0:
                 # 写入列名
                 sheet1.write(i, j, name)
-            sheet1.write(i+1, j, one.get(name, '-'))
+            sheet1.write(i + 1, j, one.get(name, '-'))
 
     sio = BytesIO()
     f.save(sio)
@@ -266,12 +278,13 @@ def down_peers(request):
     response['Content-Disposition'] = 'attachment; filename=DeviceInfo.xls'
     response.write(sio.getvalue())
     return response
-    
+
+
 def check_sharelink_expired(sharelink):
     now = datetime.datetime.now()
     if sharelink.create_time > now:
         return False
-    if (now - sharelink.create_time).seconds <15 * 60:
+    if (now - sharelink.create_time).seconds < 15 * 60:
         return False
     else:
         sharelink.is_expired = True
@@ -284,19 +297,18 @@ 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))
-    peers = [{'id':ix+1, 'name':f'{p.rid}|{p.alias}'} for ix, p in enumerate(peers)]
+    peers = [{'id': ix + 1, 'name': f'{p.rid}|{p.alias}'} for ix, p in enumerate(peers)]
-    sharelinks = [{'shash':s.shash, 'is_used':s.is_used, 'is_expired':s.is_expired, 'create_time':s.create_time, 'peers':s.peers} for ix, s in enumerate(sharelinks)]
+    sharelinks = [{'shash': s.shash, 'is_used': s.is_used, 'is_expired': s.is_expired, 'create_time': s.create_time, 'peers': s.peers} for ix, s in enumerate(sharelinks)]
 
     if request.method == 'GET':
         url = request.build_absolute_uri()
         if url.endswith('share'):
-            return render(request, 'share.html', {'peers':peers, 'sharelinks':sharelinks})
+            return render(request, 'share.html', {'peers': peers, 'sharelinks': sharelinks})
         else:
             shash = url.split('/')[-1]
             sharelink = ShareLink.objects.filter(Q(shash=shash))
@@ -318,20 +330,20 @@ 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:
                             continue
-                        #peer = RustDeskPeer.objects.get(rid=peer.rid)
+                        # peer = RustDeskPeer.objects.get(rid=peer.rid)
                         peer_f = RustDeskPeer.objects.filter(Q(rid=peer.rid) & Q(uid=sharelink.uid))
                         if not peer_f:
                             msg += f"{peer.rid}已存在,"
                             continue
-                        
+
                         if len(peer_f) > 1:
-                             msg += f'{peer.rid}存在多个,已经跳过。 '
+                            msg += f'{peer.rid}存在多个,已经跳过。 '
-                             continue
+                            continue
                         peer = peer_f[0]
                         peer.id = None
                         peer.uid = request.user.id
@@ -342,52 +354,52 @@ def share(request):
 
             title = _(title)
             msg = _(msg)
-            return render(request, 'msg.html', {'title':msg, 'msg':msg})
+            return render(request, 'msg.html', {'title': msg, 'msg': msg})
     else:
         data = request.POST.get('data', '[]')
 
         data = json.loads(data)
         if not data:
-            return JsonResponse({'code':0, 'msg':_('数据为空。')})
+            return JsonResponse({'code': 0, 'msg': _('数据为空。')})
         rustdesk_ids = [x['title'].split('|')[0] for x in data]
         rustdesk_ids = ','.join(rustdesk_ids)
         sharelink = ShareLink(
             uid=request.user.id,
-            shash = getStrMd5(str(time.time())+salt),
+            shash=getStrMd5(str(time.time()) + salt),
             peers=rustdesk_ids,
         )
         sharelink.save()
 
-        return JsonResponse({'code':1, 'shash':sharelink.shash})
+        return JsonResponse({'code': 1, 'shash': sharelink.shash})
 
 
 def get_conn_log():
     logs = ConnLog.objects.all()
-    logs = {x.id:model_to_dict(x) for x in logs}
+    logs = {x.id: model_to_dict(x) for x in logs}
 
     for k, v in logs.items():
         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()
+        # from_zone = tz.tzutc()
-        #to_zone = tz.tzlocal()
+        # to_zone = tz.tzlocal()
-        #utc = logs[k]['logged_at']
+        # utc = logs[k]['logged_at']
-        #utc = utc.replace(tzinfo=from_zone)
+        # utc = utc.replace(tzinfo=from_zone)
-        #logs[k]['logged_at'] = utc.astimezone(to_zone)
+        # logs[k]['logged_at'] = utc.astimezone(to_zone)
         try:
             duration = round((logs[k]['conn_end'] - logs[k]['conn_start']).total_seconds())
             m, s = divmod(duration, 60)
             h, m = divmod(m, 60)
-            #d, h = divmod(h, 24)
+            # 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,20 +409,21 @@ 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}
+    logs = {x.id: model_to_dict(x) for x in logs}
 
     for k, v in logs.items():
         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,16 +433,18 @@ 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)
     page_number = request.GET.get('page')
     page_obj = paginator.get_page(page_number)
-    return render(request, 'show_conn_log.html', {'page_obj':page_obj})
+    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)
     page_number = request.GET.get('page')
     page_obj = paginator.get_page(page_number)
-    return render(request, 'show_file_log.html', {'page_obj':page_obj})
+    return render(request, 'show_file_log.html', {'page_obj': page_obj})

rustdesk_server_api/settings.py

@@ -30,21 +30,23 @@ ID_SERVER = os.environ.get("ID_SERVER", '')
 DEBUG = os.environ.get("DEBUG", False)
 DEFAULT_AUTO_FIELD = 'django.db.models.AutoField'
 ALLOWED_HOSTS = ["*"]
-AUTH_USER_MODEL = 'api.UserProfile'      #AppName.自定义user
+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')
 MYSQL_DBNAME = os.environ.get("MYSQL_DBNAME", '-')
 MYSQL_HOST = os.environ.get("MYSQL_HOST", '127.0.0.1')
 MYSQL_USER = os.environ.get("MYSQL_USER", '-')
 MYSQL_PASSWORD = os.environ.get("MYSQL_PASSWORD", '-')
 MYSQL_PORT = os.environ.get("MYSQL_PORT", '3306')
-#==========数据库配置 结束=====================
+# ==========数据库配置 结束=====================
 
 LANGUAGE_CODE = os.environ.get("LANGUAGE_CODE", 'zh-hans')
-##LANGUAGE_CODE = os.environ.get("LANGUAGE_CODE", 'en')
+# #LANGUAGE_CODE = os.environ.get("LANGUAGE_CODE", 'en')
 
 # Application definition
 
@@ -64,7 +66,7 @@ MIDDLEWARE = [
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.middleware.locale.LocaleMiddleware',
     'django.middleware.common.CommonMiddleware',
-    #'django.middleware.csrf.CsrfViewMiddleware',   # 取消post的验证。
+    # 'django.middleware.csrf.CsrfViewMiddleware',   # 取消post的验证。
     'django.contrib.auth.middleware.AuthenticationMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
@@ -102,19 +104,19 @@ DATABASES = {
         'NAME': BASE_DIR / 'db/db.sqlite3',
     }
 }
-if DATABASE_TYPE == 'MYSQL' and MYSQL_DBNAME!='-' and MYSQL_USER!= '-' and MYSQL_PASSWORD!='-':
+if DATABASE_TYPE == 'MYSQL' and MYSQL_DBNAME != '-' and MYSQL_USER != '-' and MYSQL_PASSWORD != '-':
     # 简单通过数据库名、账密信息过滤下，防止用户未配置mysql却使用mysql
     DATABASES = {
-    'default': {
+        'default': {
-        'ENGINE': 'django.db.backends.mysql',
+            'ENGINE': 'django.db.backends.mysql',
-        'NAME': MYSQL_DBNAME,               # 数据库名
+            'NAME': MYSQL_DBNAME,               # 数据库名
-        'HOST': MYSQL_HOST,                 # 数据库服务器IP
+            'HOST': MYSQL_HOST,                 # 数据库服务器IP
-        'USER': MYSQL_USER,                 # 数据库用户名
+            'USER': MYSQL_USER,                 # 数据库用户名
-        'PASSWORD': MYSQL_PASSWORD,         # 数据库密码
+            'PASSWORD': MYSQL_PASSWORD,         # 数据库密码
-        'PORT': MYSQL_PORT,                 # 端口
+            'PORT': MYSQL_PORT,                 # 端口
-        'OPTIONS': {'charset': 'utf8'},
+            'OPTIONS': {'charset': 'utf8'},
+        }
     }
-}
 
 # Password validation
 # https://docs.djangoproject.com/en/3.1/ref/settings/#auth-password-validators
@@ -138,7 +140,7 @@ AUTH_PASSWORD_VALIDATORS = [
 # Internationalization
 # https://docs.djangoproject.com/en/3.1/topics/i18n/
 
-#LANGUAGE_CODE = 'zh-hans'
+# LANGUAGE_CODE = 'zh-hans'
 
 TIME_ZONE = 'Asia/Shanghai'
 
@@ -146,7 +148,7 @@ USE_I18N = True
 
 USE_L10N = True
 
-#USE_TZ = True
+# USE_TZ = True
 USE_TZ = False
 
 
@@ -159,16 +161,14 @@ if DEBUG:
     STATICFILES_DIRS = [os.path.join(BASE_DIR, 'static')]
 
 else:
-
-
     STATIC_ROOT = os.path.join(BASE_DIR, 'static')     # 新增
 
 LANGUAGES = (
     ('zh-hans', '中文简体'),
     ('en', 'English'),
- 
+
 )
- 
+
 LOCALE_PATHS = (
     os.path.join(BASE_DIR, 'locale'),
 )