改动大，增加三个版本分别管理

Ansjer/config.py

@@ -12,10 +12,12 @@
 @Contact: chanjunkai@163.com
 """
 #主要静态变量配置文件
-import datetime
-from Ansjer.settings import SERVER_TYPE
+import datetime,os
 
 
+SERVER_TYPE = os.environ.get('DJANGO_SETTINGS_MODULE')
+print(SERVER_TYPE)
+
 # 发送邮件邮箱
 COMPANY_EMAIL = 'user_server@nsst.com'
 AWS_ACCESS_ID = 'AKIAJKPU23EU5QWHFPKQ'
@@ -41,25 +43,29 @@ TX_PHONE_APP_KEY= '7705976ca6e85fe7b86d6bc2d11f7783'
 AuthCode_Expire = 600
 
 RTMP_PUSH_URL = 'http://13.56.215.252:8091/hls'
-
-if SERVER_TYPE == 'local':
+# 根路径
+BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+#
+# print('[[[[[[[')
+# print(type())
+# print('[[[[[[[')
+if SERVER_TYPE == 'Ansjer.local_settings':
     NGINX_RTMP_STAT = 'http://192.168.136.45:8077/stat'
     SERVER_DOMAIN = 'http://192.168.136.45:8077'
     DATABASE_DATA = 'Ansjer'
     SERVER_HOST = '192.168.136.45'
     DOMAIN_HOST = '192.168.136.45'
     RTMP_PUSH_URL = 'rtmp://192.168.136.45:1935/hls'
-elif SERVER_TYPE == 'test':
+elif SERVER_TYPE == 'Ansjer.test_settings':
     NGINX_RTMP_STAT = 'http://test.dvema.com/stat'
     SERVER_DOMAIN = 'http://test.dvema.com'
     DOMAIN_HOST = 'test.dvema.com'
     DATABASE_DATA = 'AnsjerTest'
     SERVER_HOST = 'localhost'
-elif SERVER_TYPE == 'formal':
+elif SERVER_TYPE == 'Ansjer.formal_settings':
     NGINX_RTMP_STAT = 'http://www.dvema.com/stat'
     SERVER_DOMAIN = 'http://www.dvema.com'
     DOMAIN_HOST = 'www.dvema.com'
     DATABASE_DATA = 'Ansjer81'
     SERVER_HOST = 'localhost'
 
-

Ansjer/settings.py → Ansjer/formal_settings.py

@@ -1,11 +1,7 @@
 import os
+from Ansjer.config import BASE_DIR
 
-SERVER_TYPE = 'local'
-# SERVER_TYPE = 'test'
-# SERVER_TYPE = 'formal'
-print(SERVER_TYPE)
 SECRET_KEY = 'c7ki2_gkg4#sjfm-u1%$s#&n#szf01f*v69rwv2qsf#-zmm@tl'
-BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 DEBUG = True
 # DEBUG = False
 ALLOWED_HOSTS = ['*']
@@ -72,19 +68,12 @@ TEMPLATES = [
     },
 ]
 
-WSGI_APPLICATION = 'Ansjer.wsgi.application'
+WSGI_APPLICATION = 'Ansjer.formal_wsgi.application'
 
 # 服务器类型
-if SERVER_TYPE == 'local':
-    DATABASE_DATA = 'Ansjer'
-    SERVER_HOST = '192.168.136.45'
-elif SERVER_TYPE == 'test':
-    NGINX_RTMP_STAT = 'http://13.56.215.252:82/stat'
-    DATABASE_DATA = 'AnsjerTest'
-    SERVER_HOST = 'localhost'
-elif SERVER_TYPE == 'formal':
-    DATABASE_DATA = 'Ansjer81'
-    SERVER_HOST = 'localhost'
+DATABASE_DATA = 'Ansjer81'
+SERVER_HOST = 'localhost'
+
 
 DATABASES = {'default': {
     'ENGINE': 'django.db.backends.mysql',

Ansjer/formal_wsgi.py

@@ -0,0 +1,16 @@
+"""
+WSGI config for Ansjer project.
+
+It exposes the WSGI callable as a module-level variable named ``application``.
+
+For more information on this file, see
+https://docs.djangoproject.com/en/dev/howto/deployment/wsgi/
+"""
+
+import os
+
+from django.core.wsgi import get_wsgi_application
+
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "Ansjer.formal_settings")
+
+application = get_wsgi_application()

Ansjer/local_settings.py

@@ -0,0 +1,204 @@
+import os
+from Ansjer.config import BASE_DIR
+
+
+SECRET_KEY = 'c7ki2_gkg4#sjfm-u1%$s#&n#szf01f*v69rwv2qsf#-zmm@tl'
+DEBUG = True
+# DEBUG = False
+ALLOWED_HOSTS = ['*']
+
+INSTALLED_APPS = [
+    'django.contrib.admin',
+    'django.contrib.auth',
+    'django.contrib.contenttypes',
+    'django.contrib.sessions',
+    'django.contrib.messages',
+    'django.contrib.staticfiles',
+    'corsheaders',
+    'imagekit',
+    'Model',
+]
+
+MIDDLEWARE = [
+    'corsheaders.middleware.CorsMiddleware',
+    'Service.middleware.StatisticsUrlMiddleware',
+    'django.middleware.security.SecurityMiddleware',
+    'django.contrib.sessions.middleware.SessionMiddleware',
+    'django.middleware.common.CommonMiddleware',
+    # 'django.middleware.csrf.CsrfViewMiddleware',
+    'corsheaders.middleware.CorsPostCsrfMiddleware',
+    'django.contrib.auth.middleware.AuthenticationMiddleware',
+    'django.contrib.messages.middleware.MessageMiddleware',
+    'django.middleware.clickjacking.XFrameOptionsMiddleware',
+    'django.middleware.security.SecurityMiddleware',
+    'django_global_request.middleware.GlobalRequestMiddleware',
+]
+
+AUTHENTICATION_BACKENDS = (
+    'django.contrib.auth.backends.ModelBackend',  # django default backend
+    'guardian.backends.ObjectPermissionBackend',
+)
+
+ADDR_URL = []
+ANONYMOUS_USER_ID = -1  # 支持匿名用户
+
+STATIC_URL = '/static/'
+
+# 上传路径根目录
+MEDIA_ROOT = os.path.join(BASE_DIR, 'static/Upgrate')
+# 在浏览器上访问该上传文件的url的前缀
+MEDIA_URL = '/static/Upgrate/'
+ROOT_URLCONF = 'Ansjer.urls'
+LOGIN_URL = '/account/login'
+AUTH_USER_MODEL = 'Model.Device_User'  # 自定义Model
+APPEND_SLASH = False
+
+TEMPLATES = [
+    {
+        'BACKEND': 'django.template.backends.django.DjangoTemplates',
+        'DIRS': [BASE_DIR + '/static/templates', ],
+        'APP_DIRS': True,
+        'OPTIONS': {
+            'context_processors': [
+                'django.template.context_processors.debug',
+                'django.template.context_processors.request',
+                'django.contrib.auth.context_processors.auth',
+                'django.contrib.messages.context_processors.messages',
+            ],
+        },
+    },
+]
+
+WSGI_APPLICATION = 'Ansjer.local_wsgi.application'
+
+# 服务器类型
+DATABASE_DATA = 'Ansjer'
+SERVER_HOST = '192.168.136.45'
+
+DATABASES = {'default': {
+    'ENGINE': 'django.db.backends.mysql',
+    'NAME': DATABASE_DATA,
+    'USER': 'ansjer',
+    'PASSWORD': '1234',
+    'HOST': SERVER_HOST,
+    'PORT': '3306',
+    'OPTIONS': {'charset': 'utf8mb4', 'use_unicode': True, 'init_command': "SET sql_mode='STRICT_TRANS_TABLES'"},
+    'AUTOCOMMIT': True
+}}
+
+AUTH_PASSWORD_VALIDATORS = [
+    {
+        'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator',
+    },
+    {
+        'NAME': 'django.contrib.auth.password_validation.MinimumLengthValidator',
+    },
+    {
+        'NAME': 'django.contrib.auth.password_validation.CommonPasswordValidator',
+    },
+    {
+        'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator',
+    },
+]
+
+LANGUAGE_CODE = 'en-us'
+TIME_ZONE = 'Asia/Shanghai'
+# TIME_ZONE = 'UTC'
+USE_I18N = True
+USE_L10N = True
+USE_TZ = True
+
+# 跨域增加忽略
+CORS_ALLOW_CREDENTIALS = True
+CORS_ORIGIN_ALLOW_ALL = True
+CORS_ORIGIN_WHITELIST = ('*')
+
+CORS_ALLOW_METHODS = (
+    'DELETE',
+    'GET',
+    'OPTIONS',
+    'PATCH',
+    'POST',
+    'PUT',
+    'VIEW',
+)
+
+CORS_ALLOW_HEADERS = (
+    'XMLHttpRequest',
+    'X_FILENAME',
+    'accept',
+    'accept-encoding',
+    'authorization',
+    'content-type',
+    'dnt',
+    'origin',
+    'user-agent',
+    'x-csrftoken',
+    'x-requested-with',
+    'Pragma',
+)
+
+#########################################
+'''
+增加错误信息推送到管理员邮箱
+'''
+# 管理员邮箱
+ADMINS = (
+    ('admin', 'chanjunkai@163.com'),
+    ('admin', '1379072853@qq.com'),
+)
+
+# 非空链接，却发生404错误，发送通知MANAGERS
+SEND_BROKEN_LINK_EMAILS = True
+MANAGERS = ADMINS
+
+# Email设置
+EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'
+EMAIL_HOST = 'smtp.163.com'  # QQ邮箱SMTP服务器(邮箱需要开通SMTP服务)
+EMAIL_PORT = 25  # QQ邮箱SMTP服务端口
+EMAIL_HOST_USER = 'chanjunkai@163.com'  # 我的邮箱帐号
+EMAIL_HOST_PASSWORD = 'cjk1234'  # 授权码
+EMAIL_SUBJECT_PREFIX = 'website'  # 为邮件标题的前缀,默认是'[django]'
+EMAIL_USE_TLS = True  # 开启安全链接
+DEFAULT_FROM_EMAIL = SERVER_EMAIL = EMAIL_HOST_USER  # 设置发件人
+
+LOGGING = {
+    'version': 1,
+    'disable_existing_loggers': True,
+    'formatters': {
+        'error_format': {
+            # 'format': '{"asctime":"%(asctime)s","thread":"%(threadName)s:%(thread)d","errorline":"%(lineno)d","errorlevel":"%(levelname)s","errorcontent":"%(message)s"}'
+            'format': '%(asctime)s %(threadName)s %(thread)d %(lineno)d %(levelname)s %(message)s'
+        },
+    },
+    'filters': {
+    },
+    'handlers': {
+        'mail_admins': {
+            'level': 'ERROR',
+            'class': 'django.utils.log.AdminEmailHandler',
+            'include_html': True,
+        },
+        'default': {
+            'level': 'ERROR',
+            'class': 'logging.handlers.RotatingFileHandler',
+            'filename': BASE_DIR + '/static/log/error.log',
+            'maxBytes': 1024 * 1024 * 5,  # 5 MB
+            'backupCount': 5,
+            'formatter': 'error_format',
+        },
+        'console': {
+            'level': 'ERROR',
+            'class': 'logging.StreamHandler',
+            'formatter': 'error_format'
+        },
+    },
+    'loggers': {
+        'django': {
+            'handlers': ['default', 'console'],
+            # 'handlers': ['mail_admins','default','console'],
+            'level': 'ERROR',
+            'propagate': False
+        },
+    }
+}

Ansjer/local_wsgi.py

@@ -0,0 +1,16 @@
+"""
+WSGI config for Ansjer project.
+
+It exposes the WSGI callable as a module-level variable named ``application``.
+
+For more information on this file, see
+https://docs.djangoproject.com/en/dev/howto/deployment/wsgi/
+"""
+
+import os
+
+from django.core.wsgi import get_wsgi_application
+
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "Ansjer.local_settings")
+
+application = get_wsgi_application()

Ansjer/test/oss.py

@@ -19,16 +19,16 @@ import urllib
 
 ###########
 host = "oss-cn-shenzhen.aliyuncs.com"  # just for example
-accessid = "LTAIXSozepSx81xe"
-accesskey = "19BlxRiAHDPLx4mhz6vQZRuhK0eKed"
-bucket_name = "testrtmp"
-channel_name = "test-channel"
+accessid = 'LTAIpezLGJWqmrwR'
+accesskey = 'S6vx8nZQw8pwoX07qMMnLdA61TMvX5'
+bucket_name = "cloudvod1"
+channel_name = "vod"
 auth = Auth(accessid, accesskey)
 bucket = Bucket(auth, host, bucket_name)
 ######################
 # 生成oss签名url
-url = bucket.sign_url('GET', 'vod/video/py.m3u8', 60 * 60, params={'x-oss-process': 'hls/sign'})
-# url = bucket.sign_url('GET', 'vod/video_audio/vod22.m3u8', 60 * 60)
+url = bucket.sign_url('GET', 'vod/video/ii.m3u8', 60 * 60, params={'x-oss-process': 'hls/sign'})
+# url = bucket.sign_url('GET', 'vod/playlist.m3u8', 60 * 60,params={'x-oss-process': 'hls/sign'})
 url = urllib.parse.unquote(url, encoding='utf-8', errors='replace')
 print(url)
 
@@ -37,12 +37,12 @@ exit()
 # m3list = bucket.post_vod_playlist(channel_name=channel_name, playlist_name='test.m3u8', start_time=1537336020119,
 #                                   end_time=1537336029318)
 
-# exit()
+exit()
 # 获取推流地址
 channel_cfg = LiveChannelInfo(target=LiveChannelInfoTarget(frag_count=10))
 channel = bucket.create_live_channel(channel_name, channel_cfg)
 publish_url = channel.publish_url
-signed_publish_url = bucket.sign_rtmp_url("test-channel", "playlist.m3u8", 3600)
+signed_publish_url = bucket.sign_rtmp_url("vod", "playlist.m3u8", 3600)
 print(signed_publish_url)
 
 '''

Ansjer/test_settings.py

@@ -0,0 +1,204 @@
+import os
+from Ansjer.config import BASE_DIR
+
+
+SECRET_KEY = 'c7ki2_gkg4#sjfm-u1%$s#&n#szf01f*v69rwv2qsf#-zmm@tl'
+DEBUG = True
+# DEBUG = False
+ALLOWED_HOSTS = ['*']
+
+INSTALLED_APPS = [
+    'django.contrib.admin',
+    'django.contrib.auth',
+    'django.contrib.contenttypes',
+    'django.contrib.sessions',
+    'django.contrib.messages',
+    'django.contrib.staticfiles',
+    'corsheaders',
+    'imagekit',
+    'Model',
+]
+
+MIDDLEWARE = [
+    'corsheaders.middleware.CorsMiddleware',
+    'Service.middleware.StatisticsUrlMiddleware',
+    'django.middleware.security.SecurityMiddleware',
+    'django.contrib.sessions.middleware.SessionMiddleware',
+    'django.middleware.common.CommonMiddleware',
+    # 'django.middleware.csrf.CsrfViewMiddleware',
+    'corsheaders.middleware.CorsPostCsrfMiddleware',
+    'django.contrib.auth.middleware.AuthenticationMiddleware',
+    'django.contrib.messages.middleware.MessageMiddleware',
+    'django.middleware.clickjacking.XFrameOptionsMiddleware',
+    'django.middleware.security.SecurityMiddleware',
+    'django_global_request.middleware.GlobalRequestMiddleware',
+]
+
+AUTHENTICATION_BACKENDS = (
+    'django.contrib.auth.backends.ModelBackend',  # django default backend
+    'guardian.backends.ObjectPermissionBackend',
+)
+
+ADDR_URL = []
+ANONYMOUS_USER_ID = -1  # 支持匿名用户
+
+STATIC_URL = '/static/'
+
+# 上传路径根目录
+MEDIA_ROOT = os.path.join(BASE_DIR, 'static/Upgrate')
+# 在浏览器上访问该上传文件的url的前缀
+MEDIA_URL = '/static/Upgrate/'
+ROOT_URLCONF = 'Ansjer.urls'
+LOGIN_URL = '/account/login'
+AUTH_USER_MODEL = 'Model.Device_User'  # 自定义Model
+APPEND_SLASH = False
+
+TEMPLATES = [
+    {
+        'BACKEND': 'django.template.backends.django.DjangoTemplates',
+        'DIRS': [BASE_DIR + '/static/templates', ],
+        'APP_DIRS': True,
+        'OPTIONS': {
+            'context_processors': [
+                'django.template.context_processors.debug',
+                'django.template.context_processors.request',
+                'django.contrib.auth.context_processors.auth',
+                'django.contrib.messages.context_processors.messages',
+            ],
+        },
+    },
+]
+
+WSGI_APPLICATION = 'Ansjer.test_wsgi.application'
+
+# 服务器类型
+DATABASE_DATA = 'AnsjerTest'
+SERVER_HOST = 'localhost'
+
+DATABASES = {'default': {
+    'ENGINE': 'django.db.backends.mysql',
+    'NAME': DATABASE_DATA,
+    'USER': 'ansjer',
+    'PASSWORD': '1234',
+    'HOST': SERVER_HOST,
+    'PORT': '3306',
+    'OPTIONS': {'charset': 'utf8mb4', 'use_unicode': True, 'init_command': "SET sql_mode='STRICT_TRANS_TABLES'"},
+    'AUTOCOMMIT': True
+}}
+
+AUTH_PASSWORD_VALIDATORS = [
+    {
+        'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator',
+    },
+    {
+        'NAME': 'django.contrib.auth.password_validation.MinimumLengthValidator',
+    },
+    {
+        'NAME': 'django.contrib.auth.password_validation.CommonPasswordValidator',
+    },
+    {
+        'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator',
+    },
+]
+
+LANGUAGE_CODE = 'en-us'
+TIME_ZONE = 'Asia/Shanghai'
+# TIME_ZONE = 'UTC'
+USE_I18N = True
+USE_L10N = True
+USE_TZ = True
+
+# 跨域增加忽略
+CORS_ALLOW_CREDENTIALS = True
+CORS_ORIGIN_ALLOW_ALL = True
+CORS_ORIGIN_WHITELIST = ('*')
+
+CORS_ALLOW_METHODS = (
+    'DELETE',
+    'GET',
+    'OPTIONS',
+    'PATCH',
+    'POST',
+    'PUT',
+    'VIEW',
+)
+
+CORS_ALLOW_HEADERS = (
+    'XMLHttpRequest',
+    'X_FILENAME',
+    'accept',
+    'accept-encoding',
+    'authorization',
+    'content-type',
+    'dnt',
+    'origin',
+    'user-agent',
+    'x-csrftoken',
+    'x-requested-with',
+    'Pragma',
+)
+
+#########################################
+'''
+增加错误信息推送到管理员邮箱
+'''
+# 管理员邮箱
+ADMINS = (
+    ('admin', 'chanjunkai@163.com'),
+    ('admin', '1379072853@qq.com'),
+)
+
+# 非空链接，却发生404错误，发送通知MANAGERS
+SEND_BROKEN_LINK_EMAILS = True
+MANAGERS = ADMINS
+
+# Email设置
+EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'
+EMAIL_HOST = 'smtp.163.com'  # QQ邮箱SMTP服务器(邮箱需要开通SMTP服务)
+EMAIL_PORT = 25  # QQ邮箱SMTP服务端口
+EMAIL_HOST_USER = 'chanjunkai@163.com'  # 我的邮箱帐号
+EMAIL_HOST_PASSWORD = 'cjk1234'  # 授权码
+EMAIL_SUBJECT_PREFIX = 'website'  # 为邮件标题的前缀,默认是'[django]'
+EMAIL_USE_TLS = True  # 开启安全链接
+DEFAULT_FROM_EMAIL = SERVER_EMAIL = EMAIL_HOST_USER  # 设置发件人
+
+LOGGING = {
+    'version': 1,
+    'disable_existing_loggers': True,
+    'formatters': {
+        'error_format': {
+            # 'format': '{"asctime":"%(asctime)s","thread":"%(threadName)s:%(thread)d","errorline":"%(lineno)d","errorlevel":"%(levelname)s","errorcontent":"%(message)s"}'
+            'format': '%(asctime)s %(threadName)s %(thread)d %(lineno)d %(levelname)s %(message)s'
+        },
+    },
+    'filters': {
+    },
+    'handlers': {
+        'mail_admins': {
+            'level': 'ERROR',
+            'class': 'django.utils.log.AdminEmailHandler',
+            'include_html': True,
+        },
+        'default': {
+            'level': 'ERROR',
+            'class': 'logging.handlers.RotatingFileHandler',
+            'filename': BASE_DIR + '/static/log/error.log',
+            'maxBytes': 1024 * 1024 * 5,  # 5 MB
+            'backupCount': 5,
+            'formatter': 'error_format',
+        },
+        'console': {
+            'level': 'ERROR',
+            'class': 'logging.StreamHandler',
+            'formatter': 'error_format'
+        },
+    },
+    'loggers': {
+        'django': {
+            'handlers': ['default', 'console'],
+            # 'handlers': ['mail_admins','default','console'],
+            'level': 'ERROR',
+            'propagate': False
+        },
+    }
+}

Ansjer/wsgi.py → Ansjer/test_wsgi.py

@@ -11,6 +11,6 @@ import os
 
 from django.core.wsgi import get_wsgi_application
 
-os.environ.setdefault("DJANGO_SETTINGS_MODULE", "Ansjer.settings")
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "Ansjer.test_settings")
 
 application = get_wsgi_application()

Controller/CheckUserData.py

@@ -12,7 +12,7 @@ from django.utils.decorators import method_decorator
 from django.views.decorators.csrf import csrf_exempt
 from django.views.generic import TemplateView
 
-from Ansjer.settings import BASE_DIR
+from Ansjer.config import BASE_DIR
 from Model.models import Device_User
 from Object.ResponseObject import ResponseObject
 

Controller/EquipmentOTA.py

@@ -8,7 +8,7 @@ from django.utils import timezone
 import os,simplejson as json
 from Object.ResponseObject import ResponseObject
 from Object.TokenObject import TokenObject
-from Ansjer.settings import BASE_DIR
+from Ansjer.config import BASE_DIR
 from Ansjer.config import SERVER_DOMAIN
 import time
 

Controller/LogManager.py

@@ -2,12 +2,12 @@ from Controller import OTAEquipment
 from django.views.decorators.csrf import csrf_exempt
 from django.views.generic import TemplateView
 from django.utils.decorators import method_decorator
-import Ansjer.settings as api_settings
+from Ansjer import local_settings as api_settings
 from Service.ModelService import ModelService
 import time,os
 from Object.ResponseObject import ResponseObject
 from Object.TokenObject import TokenObject
-from Ansjer.settings import BASE_DIR
+from Ansjer.config import BASE_DIR
 
 
 def StatisticsData(request):

Controller/OTAEquipment.py

@@ -14,7 +14,7 @@ import time, os, simplejson as json
 from Object.ResponseObject import ResponseObject
 from Object.TokenObject import TokenObject
 from django.http import HttpResponse
-from Ansjer.settings import BASE_DIR
+from Ansjer.config import BASE_DIR
 
 
 def addNewEquipmentVersion(deviceContent, token, response):

Controller/StreamMedia.py

@@ -9,7 +9,7 @@ import traceback, xmltodict, requests, re, subprocess, time, os,simplejson as js
 from ffmpy import FFmpeg
 from Object.AWS.CloudfrontSignCookie import BetterThanBoto
 from Ansjer.config import NGINX_RTMP_STAT, RTMP_PUSH_URL
-from Ansjer.settings import BASE_DIR
+from Ansjer.config import BASE_DIR
 from Object.TokenObject import TokenObject
 from Object.ResponseObject import ResponseObject
 from Service.CommonService import CommonService

Controller/SysManage.py

@@ -14,7 +14,7 @@
 from django.views.decorators.csrf import csrf_exempt
 from Service.CommonService import CommonService
 from Service.ModelService import ModelService
-from Ansjer.settings import BASE_DIR
+from Ansjer.config import BASE_DIR
 from Object.ResponseObject import ResponseObject
 from Object.TokenObject import TokenObject
 import os

Controller/Test.py

@@ -14,7 +14,6 @@
 from django.views.generic.base import View
 from django.utils.decorators import method_decorator
 from django.views.decorators.csrf import csrf_exempt
-# from Ansjer.settings import *
 from django.contrib import auth
 from django.http import HttpResponseRedirect
 

Controller/UserController.py

@@ -11,7 +11,7 @@
 @file: UserController.py
 @Contact: chanjunkai@163.com
 """
-import traceback
+import traceback,datetime
 
 import simplejson as json
 from django.contrib import auth
@@ -23,7 +23,6 @@ from django.views.decorators.csrf import csrf_exempt
 from django.views.generic import TemplateView
 from ratelimit.decorators import ratelimit
 
-from Ansjer.config import *
 from Controller.CheckUserData import DataValid, date_handler, RandomStr
 from Model.models import Device_User
 from Object.AWS.SesClassObject import SesClassObject
@@ -36,6 +35,7 @@ from Service.ModelService import ModelService
 from Service.TemplateService import TemplateService
 from Object.AliSmsObject import AliSmsObject
 from django.db.models import Q
+from Ansjer.config import AuthCode_Expire,SERVER_DOMAIN
 
 
 # 获取验证码
@@ -782,20 +782,6 @@ class v2registerView(TemplateView):
             if not reds.del_data(key=phone + '_identifyingCode'):
                 return response.json(10, '删除缓存验证码错误')
             return self.do_login(phone_qs, response)
-            # return response.json(0, {
-            #     "user": {
-            #         "userID": users.userID,
-            #         "username": users.username,
-            #         "userEmail": users.userEmail,
-            #         "phone": users.phone,
-            #         "NickName": users.NickName,
-            #         "userIconUrl": str(users.userIconUrl),
-            #         "is_superuser": users.is_superuser,
-            #         "is_active": users.is_active,
-            #         "data_joined": date_handler(users.data_joined),
-            #         "last_login": date_handler(users.last_login),
-            #     }
-            # })
 
     def do_login(self, user_qs, response):
         userID = user_qs[0].userID
@@ -850,20 +836,6 @@ class v2registerView(TemplateView):
                 return response.json(10, '删除缓存验证码错误')
             return self.do_login(email_qs, response)
 
-            return response.json(0, {
-                "user": {
-                    "userID": users.userID,
-                    "username": users.username,
-                    "userEmail": users.userEmail,
-                    "NickName": users.NickName,
-                    "userIconUrl": str(users.userIconUrl),
-                    "is_superuser": users.is_superuser,
-                    "is_active": users.is_active,
-                    "data_joined": date_handler(users.data_joined),
-                    "last_login": date_handler(users.last_login),
-                }
-            })
-
 
 # 忘记密码获取验证码v2
 class v2forgetPwdCodeView(TemplateView):

Controller/UserManger.py

@@ -14,7 +14,7 @@ from django.views.decorators.csrf import csrf_exempt
 from django.views.generic import TemplateView, View
 
 from Ansjer.config import SERVER_DOMAIN
-from Ansjer.settings import BASE_DIR
+from Ansjer.config import BASE_DIR
 from Model.models import Role, Device_User
 from Object.ResponseObject import ResponseObject
 from Object.TokenObject import TokenObject

Object/RedisObject.py

@@ -12,7 +12,7 @@
 @Contact: chanjunkai@163.com
 """
 import redis
-from Ansjer.settings import SERVER_HOST
+from Ansjer.config import SERVER_HOST
 
 class RedisObject:
 

Object/mongodb.py

@@ -14,8 +14,7 @@
 # !/usr/bin/python3
 import pymongo
 import math
-import platform
-from Ansjer.settings import SERVER_TYPE
+from Ansjer.config import SERVER_TYPE
 # SERVER_TYPE = 'local'
 
 class mongodb(object):
@@ -27,13 +26,13 @@ class mongodb(object):
         # elif (sysstr == "Linux"):
         #     print("Call Linux tasks")
         #     myclient = pymongo.MongoClient()
-        if SERVER_TYPE == 'local':
+        if SERVER_TYPE == 'Ansjer.local_settings':
             self.myclient = pymongo.MongoClient('mongodb://192.168.136.45:27017/')
             self.db =  self.myclient['ansjer']
-        elif SERVER_TYPE == 'test':
+        elif SERVER_TYPE == 'Ansjer.test_settings':
             self.myclient = pymongo.MongoClient()
             self.db =  self.myclient['test_ansjer']
-        elif SERVER_TYPE == 'formal':
+        elif SERVER_TYPE == 'Ansjer.formal_settings':
             self.myclient = pymongo.MongoClient()
             self.db = self.myclient['ansjer']
 

Service/CommonService.py

@@ -1,14 +1,15 @@
 # -*- coding: utf-8 -*-
+from pathlib import Path
+from random import Random
+
+import redis
 import simplejson as json
+import time
 from django.core import serializers
-from pyipip import IPIPDatabase
-import redis,time,base64
-from pathlib import Path
 from django.utils import timezone
-from Ansjer.settings import SERVER_HOST
-from django_global_request.middleware import get_request
-from Ansjer.settings import BASE_DIR
-from random import Random
+from pyipip import IPIPDatabase
+
+from Ansjer.config import BASE_DIR, SERVER_HOST
 
 
 # 复用性且公用较高封装代码在这

Service/middleware.py

@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 from django.utils.deprecation import MiddlewareMixin
 
-from Ansjer import settings as api_settings
+from Ansjer import local_settings as api_settings
 from Object.ResponseObject import ResponseObject
 from Service.MiscellService import MiscellService
 

formal_manage.py

@@ -0,0 +1,15 @@
+#!/usr/bin/env python
+import os
+import sys
+
+if __name__ == "__main__":
+    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "Ansjer.formal_settings")
+    try:
+        from django.core.management import execute_from_command_line
+    except ImportError as exc:
+        raise ImportError(
+            "Couldn't import Django. Are you sure it's installed and "
+            "available on your PYTHONPATH environment variable? Did you "
+            "forget to activate a virtual environment?"
+        ) from exc
+    execute_from_command_line(sys.argv)

local_manage.py

@@ -0,0 +1,17 @@
+#!/usr/bin/env python
+import os
+import sys
+
+if __name__ == "__main__":
+    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "Ansjer.local_settings")
+    try:
+        from django.core.management import execute_from_command_line
+    except ImportError as exc:
+        raise ImportError(
+            "Couldn't import Django. Are you sure it's installed and "
+            "available on your PYTHONPATH environment variable? Did you "
+            "forget to activate a virtual environment?"
+        ) from exc
+    execute_from_command_line(sys.argv)
+
+

manage.py → test_manage.py

@@ -3,7 +3,7 @@ import os
 import sys
 
 if __name__ == "__main__":
-    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "Ansjer.settings")
+    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "Ansjer.test_settings")
     try:
         from django.core.management import execute_from_command_line
     except ImportError as exc: