11

Ansjer/config.py

@@ -32,7 +32,8 @@ SERVER_TYPE = 'local'
 # SERVER_TYPE = 'formal'
 if SERVER_TYPE == 'local':
     NGINX_RTMP_STAT = 'http://192.168.136.45:8077/stat'
-    SERVER_DOMAIN = 'http://192.168.136.45:8077'
+    SERVER_DOMAIN = 'http://192.168.136.40:8077'
+    # DATABASE_DATA = 'AnsjerTest'
     DATABASE_DATA = 'Ansjer'
     SERVER_HOST = '192.168.136.45'
     RTMP_PUSH_URL = 'rtmp://192.168.136.45:1935/hls'

Ansjer/settings.py

@@ -17,6 +17,7 @@ INSTALLED_APPS = [
     'guardian',
     'django_global_request',
     'Model',
+    'oauth2_provider'
 ]
 
 MIDDLEWARE = [

Ansjer/test/666.py

@@ -1 +1,7 @@
-1
+user = {
+    'liuchunming': ['12345']
+}
+client_id = '1234567890'
+user[client_id] = []
+auth_code = {}
+oauth_redirect_uri = []

Ansjer/urls.py

@@ -3,7 +3,6 @@ from django.conf.urls import url
 # from django.views.generic.base import RedirectView
 from Controller import FeedBackInfo, EquipmentOTA, EquipmentInfo, EquipmentSensor, StreamMedia, AdminManage, AppInfo, \
     AccessLog, Test, MealManage, DeviceMeal, HlsManage, DeviceManage, EquipmentStatus, SysManage,DeviceLog,LogAccess,EquipmentManager,LogManager,PermissionManager,OTAEquipment,BatchProcessingDatabase,shareUserPermission,UserManger, CheckUserData
-# from rest_framework_jwt.views import obtain_jwt_token, refresh_jwt_token, verify_jwt_token
 
 urlpatterns = [
     url(r'^admin/', admin.site.urls),

Controller/AccessLog.py

@@ -104,7 +104,7 @@ class AccessLog(View):
                     starttime = startt.strftime("%Y-%m-%d %H:%M:%S.%f")
                     endt = datetime.datetime.fromtimestamp(int(endtime))
                     endtime = endt.strftime("%Y-%m-%d %H:%M:%S.%f")
-                    var_dump(starttime,endtime)
+                    # var_dump(starttime,endtime)
                     queryset = queryset.filter(time__range=(starttime, endtime))
                 elif starttime is not None and starttime != '':
                     startt = datetime.datetime.fromtimestamp(int(starttime))

Controller/LogAccess.py

@@ -48,7 +48,7 @@ def LogAccess(request):
                             query['time'] = {'$gte': int(starttime)}
                         elif endtime is not None and endtime != '':
                             query['time'] = {'$lte': int(endtime)}
-                        var_dump(query)
+                        # var_dump(query)
                         col = "log_access"
                         mdb = mongodb()
                         qs = mdb.findAll(col=col, page=int(page), line=int(line), query=query)

Controller/Test.py

@@ -20,9 +20,7 @@ from Service.TokenManager import *
 http://192.168.136.40:8077/Test
 '''
 import json
-from Service.ResponseService import ResponseJSON
-from django.http import HttpRequest
-
+from Service.ResponseService import *
 
 class Test(View):
     '''
@@ -37,7 +35,13 @@ class Test(View):
         return super(Test, self).dispatch(*args, **kwargs)
     # 查询
     def get(self, request, *args, **kwargs):
+        client_id = '123'
         return ResponseJSON(0,'jjj')
+
+        redirect_uri = 'http://www.baidu.com/'
+        uri = 'http://localhost:5000/oauth?response_type=code&client_id=%s&redirect_uri=%s' % (client_id, redirect_uri)
+        from django.http import HttpResponseRedirect
+        return HttpResponseRedirect(uri)
     # 增加
     def post(self, request, *args, **kwargs):
         json_data =json.loads(request.body.decode("utf-8"))

Controller/UserManger.py

@@ -665,6 +665,7 @@ class perfectUserInfoView(TemplateView):
         userContent = request.POST.get('content', None)
         userIcon = request.FILES.get('userIcon', None)
         token = request.POST.get('token', None)
+        var_dump(userIcon)
         return self.ValidationError(token, userContent, userIcon)
 
     def get(self, request, *args, **kwargs):

DB/data.json

@@ -14,4 +14,4 @@
     "Type": 10,
     "ChannelIndex": 0
   }
-}
+}

DB/data.sql

@@ -1,2 +1,2 @@
 alter table device_user add language varchar(16) NULL;
-ALTER TABLE device_info MODIFY COLUMN NickName varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci
+ALTER TABLE device_info MODIFY COLUMN NickName varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci

Service/CommonService.py

@@ -222,7 +222,7 @@ class CommonService:
     def get_userID_byT(token):
         if token == 'stest':
             userID = '151547867345163613800138001'
-            var_dump(userID)
+            # var_dump(userID)
             return userID
         if token == 'sformal':
             userID = '151564262337939513800138001'

Service/ResponseService.py

@@ -13,7 +13,7 @@ def ResponseData(code, res={},*args, **kwargs):
     else:
         LANGUAGE = 'en'
     if token is not None:
-        var_dump(token)
+        # var_dump(token)
         userID = CommonService.get_userID_byT(token)
 
         if userID is not None: