From 3d58e134aab0d6c69b052278c9012527bdef0320 Mon Sep 17 00:00:00 2001
From: kingmo888 <17401091+kingmo888@users.noreply.github.com>
Date: Thu, 13 Jun 2024 10:54:46 +0800
Subject: [PATCH] fixed #80, fixed #78

---
 db.sqlite3_bak                  | Bin 155648 -> 163840 bytes
 rustdesk_server_api/settings.py |  44 ++++++++++++++++----------------
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/db.sqlite3_bak b/db.sqlite3_bak
index 8968aa74807a49a85d5a9e5e1d3e007155eed0db..872f8abe71c0a1ea4927aac3fcdbccbe724553b8 100644
GIT binary patch
delta 2118
zcma)7O>7%Q7~S#OUjOZk6Q>Q9X}Yl+IZm2*?fr9-N+qPB2d4=|p|o&V7JHMp_%F7T
zN(kXJAUIN3q#zDGp`PGS`4Au%A|WavfuKD_J%CW!B2ZDe^*{r&>$PJiA;Oktyx;fs
z&3oTBv%B)Ob7jSKEzmJQ5JW%zH9luQILU#5o3DO~NWb%(MtQ>?*O#uW>$vlQ^AqQ}
zTFmQnR+D}k;giReVuoc|NmjBIwIr98%9XTQPOHnAlqwgBl}sUDmX&;3&J{{(oQ?BC
ztS}VgnHW3Di=&)492X>km6A`jkct0?ta>0DD@g1}LhQzDf+<aqQ-yp!TbP&UGFcVR
z`&9_TiG;*SiR95175w2Us{iRp7?u(v+z6jM(!$0a&UOfyDDW{+RJ-hi?`ntXDK0A)
z4ybpkxOCt$3x#qeujJH28X*h|EXT5ZjR|a9JMAcIK^y2ET1B6sHIzl?YrV`Edd}}5
zM;v+eiY(){w>P`XLq;9@qCS!w1j<rnK`yGLT&7&c`$5vyqNBjC-Hr}+(D||p?>ZXp
z5a>??;ZDuPK7tIg`T_uxnH{4W*JdX@TF>eGq~t!MQP0R;_mA!k_YJq^zUt1pUvi(p
z+w%ukwbKgv0KJ^SVoesQ%L*cZPODk9qBeqJJ(yZh^7GB0&|w83Kr88V1I8P49)r#l
z!5MdYOgb|duLn~L#|=I+8Z-DjI-eO~YriIg)*c!@A<#p#g}y_dqmOa5bLbM9KrwU-
z;S{d<UC2P%O85f1#eg33+N7!-lOM381UEG5n(T%5;LmUi-hto4TW}L@V2(-1+DHIs
z$rwdr6pWGAM-OL=abt`bBU}69x__LMsIW%;B6}SP2cqs%o78n`iJGFqxWG5<)sSQ(
zKwq@2#1l%M(QCx$C1>zi3yT;O;r0|=ht=!03l!?W_D1NydZY>L<uNccL|0q7qr>oJ
z6BFVLX>ILlO4G|`NQ)aQ?rC6)v?efC2b$8%vWqR+8pvMO(AL`MhO`Ex_R4QJ&JJ30
z1hhOR&<S`O+UYU(@2)4V8Rv(N%hX5qhxSYM6PCyL8zAlyceI#yV!gnE9nwk=VEw&C
z9;`3&7A^3!hukLM7X26Paob!kJ8wCm<0r?c{Y_hl+{P{XhCH=;N}#$!A@I)Wit<`k
z)la8+7Fz!HPrNWWK0C?Gjz2p!$pjmjwda!{JaCc;>URX0Wu=7um-+>kjWE+Qv&{61
zQ&TuwQga1-nlkCN#cANDmdf}g(0)-gGF6?XoO$CAs&uBLrt}v^kjdmL>bzQNT?lWc
zc{MF7l^~N=DrzN@Qw<G~)eC&xWVvb5Y>{ro{7W6(?@~`0E-zyrin(&bXI!^gx2WT=
zr`;OFc5`#3LQc*UcXQm{T+4l!Q+uC0a&a#=7GBzG3rjNARr8pj%`ncCRpUY0CQ8KQ
zZ`lG6YmU4<#!=nTD0sI|yJ8K4@Y?wq{Jj0bn%3r=UTx6UY0OhLuQ9)F^BD7202*_R
itmpp*J(|Vdt8Lo4V63(6k@eAwmTxIQ*TAEHj{gg(S9%fv

delta 298
zcmZo@;A%L)IYC-biGhJZ4TxdDV4{vOqteENCH&07+zOM~1=KeyDtzMFtRVe_g^!iL
ziHUzV|5N@Z{x$s5Hwz{d@QVsFGix&@mX>717o-;DW)>G`=I7~8p001jC_MR+zBVs+
zUNINYaBhA%2L5-O`3yerO<bTdS<e0$vp)Bu$?OjCK=W(3H$U=LVv*wJmu298%YT#q
z6#rWO89-Zd`6KzA`3?DHfr|d~ZI+FHZosV1_j)q>1dz5?zRj=aNjfs?b3{*Oe-OXf
zQQ#~4=I9s8-1&hP@-zKl;8)?h#K*>KJ+Y*2d!GU0edf)%ES=nwrP#RI92mDbFtG@T
ladKEO@ZIG7$jigc$`!?VoRg2^B8L^wC<Tt~RuN3c*a5JERCE9U

diff --git a/rustdesk_server_api/settings.py b/rustdesk_server_api/settings.py
index e65d4b6..639e615 100644
--- a/rustdesk_server_api/settings.py
+++ b/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': {
-        'ENGINE': 'django.db.backends.mysql',
-        'NAME': MYSQL_DBNAME,               # 数据库名
-        'HOST': MYSQL_HOST,                 # 数据库服务器IP
-        'USER': MYSQL_USER,                 # 数据库用户名
-        'PASSWORD': MYSQL_PASSWORD,         # 数据库密码
-        'PORT': MYSQL_PORT,                 # 端口
-        'OPTIONS': {'charset': 'utf8'},
+        'default': {
+            'ENGINE': 'django.db.backends.mysql',
+            'NAME': MYSQL_DBNAME,               # 数据库名
+            'HOST': MYSQL_HOST,                 # 数据库服务器IP
+            'USER': MYSQL_USER,                 # 数据库用户名
+            'PASSWORD': MYSQL_PASSWORD,         # 数据库密码
+            'PORT': MYSQL_PORT,                 # 端口
+            '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'),
 )