测试环境修改正式环境账号

Ansjer/config.py

@@ -64,9 +64,15 @@ elif SERVER_TYPE == 'Ansjer.test_settings':
     DOMAIN_HOST = 'test.dvema.com'
     SERVER_HOST = 'localhost'
     PAYPAL_CRD = {
-        "mode": "sandbox",  # sandbox or live
-        "client_id": "AeuhR7FHisO-lOd2OwtzyDu7PSLMmDZoDLgmzuEQ12WCtTu_8Z1AzcD4gG5SnymnuvJs-n5KBB8H9Z_G",
-        "client_secret": "EGkMCB3RWTcUGJGDYahJ9mCO0AQzEn2AvFfx1GAFjfyyn7-8a0NObcZks89QorlFpvNWTsDXVa2INRNM"
+        "mode": "live",  # sandbox or live
+        "client_id": "AdSRd6WBn-qLl9OiQHQuNYTDFSx0ZX0RUttqa58au8bPzoGYQUrt8bc6591RmH8_pEAIPijdvVYSVXyI",
+        "client_secret": "ENT-J08N3Fw0B0uAokg4RukljAwO9hFHPf8whE6-Dwd8oBWJO8AWMgpdTKpfB1pOy89t4bsFEzMWDowm"
+
+
+
+        # "mode": "sandbox",  # sandbox or live
+        # "client_id": "AeuhR7FHisO-lOd2OwtzyDu7PSLMmDZoDLgmzuEQ12WCtTu_8Z1AzcD4gG5SnymnuvJs-n5KBB8H9Z_G",
+        # "client_secret": "EGkMCB3RWTcUGJGDYahJ9mCO0AQzEn2AvFfx1GAFjfyyn7-8a0NObcZks89QorlFpvNWTsDXVa2INRNM"
     }
 elif SERVER_TYPE == 'Ansjer.formal_settings':
     NGINX_RTMP_STAT = 'http://www.dvema.com/stat'

Controller/CloudVod.py

@@ -450,12 +450,8 @@ class CloudVodView(View):
         # 新增模式
         else:
             print('create')
-            UID_Bucket.objects.create(
-                uid=UID,
-                channel=channel,
-                bucket_id=bucketId,
-                endTime=nowTime + addTime
-            )
+            UID_Bucket.objects.create(uid=UID, channel=channel,
+                                      bucket_id=bucketId, endTime=nowTime + addTime)
             # return response.json(0)
         red_url = "{SERVER_DOMAIN}cloudVod/payOK".format(SERVER_DOMAIN=SERVER_DOMAIN)
         return HttpResponseRedirect(red_url)
@@ -561,7 +557,7 @@ class CloudVodView(View):
             vod_play_list.append({'name': vod['time'], 'sign_url': vod_play_url, 'thumb': thumb, 'sec': vod['sec']})
         return response.json(0, vod_play_list)
 
-# http://test.dvema.com/cloudVod/filterVod?token=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySUQiOiIxNTIzNDE5MDcwMDY3ODUzMTM1MjcyNjA3MDciLCJ1c2VyIjoiMTM1MjcyNjA3MDciLCJsYW5nIjoiZW4iLCJleHAiOjE1NDg2NTU5NjR9.vuvgEJUyWA3mjVVBt2R5P9weqRmRNjWwAf_wsEG8sPk&did=138001380001548053701910104&channel=1&startTime=1&endTime=156489745645
+    # http://test.dvema.com/cloudVod/filterVod?token=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySUQiOiIxNTIzNDE5MDcwMDY3ODUzMTM1MjcyNjA3MDciLCJ1c2VyIjoiMTM1MjcyNjA3MDciLCJsYW5nIjoiZW4iLCJleHAiOjE1NDg2NTU5NjR9.vuvgEJUyWA3mjVVBt2R5P9weqRmRNjWwAf_wsEG8sPk&did=138001380001548053701910104&channel=1&startTime=1&endTime=156489745645
     def do_filter_playlist(self, request_dict, userID, response):
         startTime = int(request_dict.get('startTime', None))
         endTime = int(request_dict.get('endTime', None))
@@ -585,10 +581,6 @@ class CloudVodView(View):
             endpoint = vod["bucket__endpoint"]
             auth = oss2.Auth(OSS_STS_ACCESS_KEY, OSS_STS_ACCESS_SECRET)
             bucket = oss2.Bucket(auth, endpoint, bucket_name)
-            # m3u8 = '{uid}/vod{channel}/{daytime}/{time}/{time}.m3u8'. \
-            #     format(uid=UID, channel=channel, daytime=daytime, time=vod['time'])
-            # ts = '{uid}/vod{channel}/{daytime}/{time}/ts0.ts'. \
-            #     format(uid=UID, channel=channel, daytime=daytime, time=vod['time'])
             m3u8 = '{uid}/vod{channel}/{time}/{time}.m3u8'. \
                 format(uid=UID, channel=channel, time=vod['time'])
             ts = '{uid}/vod{channel}/{time}/ts0.ts'. \

Controller/UserController.py

@@ -11,11 +11,12 @@
 @file: UserController.py
 @Contact: chanjunkai@163.com
 """
-from Model.models import Role
-import traceback, datetime
+import datetime
+import traceback
 
 import simplejson as json
 from django.contrib.auth.hashers import make_password, check_password  # 对密码加密模块
+from django.db.models import Q
 from django.http import HttpResponseRedirect
 from django.utils.decorators import method_decorator
 from django.utils.timezone import utc
@@ -23,19 +24,18 @@ from django.views.decorators.csrf import csrf_exempt
 from django.views.generic import TemplateView
 from ratelimit.decorators import ratelimit
 
+from Ansjer.config import AuthCode_Expire, SERVER_DOMAIN
 from Controller.CheckUserData import DataValid, date_handler, RandomStr
 from Model.models import Device_User
+from Model.models import Role
 from Object.AWS.SesClassObject import SesClassObject
+from Object.AliSmsObject import AliSmsObject
 from Object.RedisObject import RedisObject
 from Object.ResponseObject import ResponseObject
 from Object.TokenObject import TokenObject
 from Service.CommonService import CommonService
-from Service.MiscellService import MiscellService
 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
 
 
 # 获取验证码
@@ -293,7 +293,6 @@ class LogoutView(TemplateView):
         tko = TokenObject(token)
         if tko.code != 0:
             return response.json(tko.code)
-        # MiscellService.add_access_log(request=request, status_code=200)
         Device_User.objects.filter(userID=tko.userID).update(online=False)
         redisObj = RedisObject(db=3)
         redisObj.del_data(key=tko.userID)

Controller/UserManger.py

@@ -235,13 +235,15 @@ def delUserInterface(request):
 
 @csrf_exempt
 def showAllUserInterface(request):
+    response = ResponseObject()
     if request.method == 'POST':
         request_dict = request.POST
     elif request.method == 'GET':
         request_dict = request.GET
+    else:
+        return response.json(404)
     token = request_dict.get('token', None)
     type = request_dict.get('type', None)
-    response = ResponseObject()
     tko = TokenObject(token)
     response.lang = tko.lang
     if tko.code != 0:
@@ -268,12 +270,6 @@ def showAllUserInterface(request):
             if len(v['fields']['role']) > 0:
                 role_query_set = Role.objects.get(rid=v['fields']['role'][0])
                 sqlDict["datas"][k]['fields']['role'].append(role_query_set.roleName)
-            # for val in device_user_res:
-            #     if v['pk'] == val.userID:
-            #         if redisObj.get_data(key=v['pk']):
-            #             sqlDict["datas"][k]['fields']['online'] = True
-            #         else:
-            #             sqlDict["datas"][k]['fields']['online'] = False
             if redisObj.get_data(key=v['pk']):
                 sqlDict["datas"][k]['fields']['online'] = True
             else:

Model/models.py

@@ -162,12 +162,6 @@ class Device_User(AbstractBaseUser):
     def __str__(self):
         return self.username
 
-    # def get_full_name(self):
-    #     return self.userEmail
-    #
-    # def get_short_name(self):
-    #     return self.username
-
     def get_role_id(self):
         rids = []
         roles = self.role.all()

Object/ResponseObject.py

@@ -44,7 +44,7 @@ class ResponseObject(object):
             424: 'Database Error !',
             444: 'Wrong parameters!',
             474: 'System Maintaining！',
-            475: 'Version too low, please upgrade the program!',
+            475: 'App Version too low, please upgrade!',
             500: 'Query Database Error:',
             700: 'Upload file error',
             701: 'The file does not exist!',