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

Ansjer/formal_settings.py

@@ -76,11 +76,10 @@ WSGI_APPLICATION = 'Ansjer.formal_wsgi.application'
 # SERVER_HOST = 'localhost'
 # DATABASES_USER = 'ansjer'
 # DATABASES_PASS = '1234'
-
 DATABASE_DATA = 'Ansjer81'
-SERVER_HOST = 'localhost'
-DATABASES_USER = 'ansjer'
-DATABASES_PASS = '1234'
+SERVER_HOST = 'azrdsinstance.clraczw4p0yj.us-west-1.rds.amazonaws.com'
+DATABASES_USER = 'azrds'
+DATABASES_PASS = 'azrds.x.x'
 
 DATABASES = {'default': {
     'ENGINE': 'django.db.backends.mysql',

Ansjer/test_settings.py

@@ -74,9 +74,14 @@ WSGI_APPLICATION = 'Ansjer.test_wsgi.application'
 
 # 服务器类型
 DATABASE_DATA = 'AnsjerTest'
-SERVER_HOST = 'localhost'
-DATABASES_USER = 'ansjer'
-DATABASES_PASS = '1234'
+SERVER_HOST = 'azrdsinstance.clraczw4p0yj.us-west-1.rds.amazonaws.com'
+DATABASES_USER = 'azrds'
+DATABASES_PASS = 'azrds.x.x'
+# 服务器类型
+# DATABASE_DATA = 'AnsjerTest'
+# SERVER_HOST = 'localhost'
+# DATABASES_USER = 'ansjer'
+# DATABASES_PASS = '1234'
 
 DATABASES = {'default': {
     'ENGINE': 'django.db.backends.mysql',

Controller/DetectController.py

@@ -405,7 +405,8 @@ class NotificationView(View):
         utko = UidTokenObject(uidToken)
         uid = utko.UID
         redisObj = RedisObject(db=6)
-        pkey = '{uid}_{channel}_ptl'.format(uid=uid, channel=channel)
+        # pkey = '{uid}_{channel}_ptl'.format(uid=uid, channel=channel)
+        pkey = '{uid}_ptl'.format(uid=uid)
         if redisObj.get_data(key=pkey):
             res_data = {'code': 0, 'msg': 'success,!'}
             return JsonResponse(status=200, data=res_data)
@@ -646,7 +647,8 @@ class PushNotificationView(View):
         uid = eto.uid
         if len(uid) == 20:
             redisObj = RedisObject(db=6)
-            pkey = '{uid}_{channel}_ptl'.format(uid=uid, channel=channel)
+            # pkey = '{uid}_{channel}_ptl'.format(uid=uid, channel=channel)
+            pkey = '{uid}_ptl'.format(uid=uid)
             # 推送时间限制
             if redisObj.get_data(key=pkey):
                 res_data = {'code': 0, 'msg': 'success,!'}

Controller/UidUser.py

@@ -12,7 +12,7 @@
 @Contact: chanjunkai@163.com
 """
 # 添加设备字段
-
+import oss2
 import re
 import time
 import simplejson as json

Service/TemplateService.py

@@ -69,7 +69,7 @@ class TemplateService:
             # 'user/initInfo',
 
             'wechat/perfect',
-            'oauth / perfect',
+            'oauth/perfect',
             'oauth/authcode',
             'detect/queryInfo',
             'deviceShadow/update'