Merge branch 'dev' of http://192.168.136.45:3000/SERVER/AnsjerServer into dev

# Conflicts:
#	Ansjer/local_settings.py

Ansjer/local_settings.py

@@ -1,219 +0,0 @@
-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', ],
-        'DIRS': [BASE_DIR + '/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 = 'AnsjerLocal'
-SERVER_HOST = '192.168.136.45'
-DATABASES_USER = 'ansjer'
-DATABASES_PASS = 'ansjer.x.x'
-
-# DATABASE_DATA = 'AnsjerLocal'
-# SERVER_HOST = 'localhost'
-# DATABASES_USER = 'root'
-# DATABASES_PASS = '123456'
-
-DATABASES = {'default': {
-    'ENGINE': 'django.db.backends.mysql',
-    'NAME': DATABASE_DATA,
-    'USER': DATABASES_USER,
-    'PASSWORD': DATABASES_PASS,
-    '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',
-            'level': 'DEBUG',
-            'class': 'logging.StreamHandler',
-            'formatter': 'error_format'
-        },
-    },
-    'loggers': {
-        'django': {
-            'handlers': ['default', 'console'],
-            # 'handlers': ['mail_admins','default','console'],
-            # 'level': 'ERROR',
-            'level': 'DEBUG',
-            'propagate': True
-        },
-        # 'django.db.backends': {
-        #     'handlers': ['console'],
-        #     'propagate': True,
-        #     'level': 'DEBUG',
-        # },
-    }
-}

Controller/ApplicationController.py

@@ -217,8 +217,8 @@ class ApplicationView(View):
             ApplicationModel.objects.create(add_time=nowTime, update_time=nowTime, client_id=client_id, name=name, client_secret=client_secret,
                                            client_type=client_type,redirect_uri=redirect_uri,skip_auth=skip_auth,grant_type=grant_type)
             return response.json(0)
-        except Exception:
-            return response.json(178)
+        except Exception as e:
+            return response.json(178,repr(e))
 
     def query(self, request_dict, userID, response):
         own_perm = ModelService.check_perm(userID, 20)

Controller/UserController.py

@@ -2088,7 +2088,7 @@ class alexaUidView(TemplateView):
             for uid_q in uid_qs:
                 uid_list.append(uid_q['UID'])
                 uid_dict[uid_q['UID']] = {'nick': uid_q['NickName'], 'password': uid_q['View_Password']}
-            us_qs = UidSetModel.objects.filter(uid__in=uid_list, is_alexa=2).values('uid', 'p2p_region')
+            us_qs = UidSetModel.objects.filter(uid__in=uid_list, is_alexa=2).values('uid', 'region_alexa')
             uid_arr = []
             for us in us_qs:
                 uid = us['uid']

Model/models.py

@@ -647,7 +647,6 @@ class UidSetModel(models.Model):
     detect_group = models.CharField(default='',max_length=32,verbose_name=u'检测类型')
     pwd = models.CharField(max_length=32, default='', verbose_name=u'设备密码')
     resetTime = models.IntegerField(default=0, verbose_name='设备重置时间')
-    detect_group = models.CharField(default='', max_length=10, verbose_name=u'检测类型')
     region_alexa = models.CharField(max_length=8, verbose_name='设备alexa区域', default='ALL')  # ALL CN EU US
     class Meta:
         db_table = 'uid_set'
@@ -814,7 +813,7 @@ class ApplicationModel(models.Model):
         ('refresh_token', "refresh_token"),
     )
     id = models.BigAutoField(primary_key=True)
-    name = models.CharField(max_length=255, blank=True, verbose_name='client名字描述')
+    name = models.CharField(max_length=128, blank=True, verbose_name='client名字描述')
     client_id = models.CharField(max_length=50, unique=True, verbose_name='客户端id')
     client_secret = models.CharField(max_length=50, unique=True,verbose_name='客户端secret')
     client_type = models.CharField(max_length=32, choices=CLIENT_TYPES, verbose_name='客户端类型')