fix:token bug

feature:add cred ctr

Ansjer/config.py

@@ -11,9 +11,8 @@
 @file: Conf.py
 @Contact: chanjunkai@163.com
 """
-#主要静态变量配置文件
-import datetime,os
-
+# 主要静态变量配置文件
+import datetime, os
 
 SERVER_TYPE = os.environ.get('DJANGO_SETTINGS_MODULE')
 print(SERVER_TYPE)
@@ -37,9 +36,9 @@ OAUTH_ACCESS_TOKEN_TIME = datetime.timedelta(days=7)
 OAUTH_REFRESH_TOKEN_TIME = datetime.timedelta(days=7)
 # 腾讯验证,短信发送
 TX_PHONE_APP_ID = '1400052907'
-TX_PHONE_APP_KEY= '7705976ca6e85fe7b86d6bc2d11f7783'
+TX_PHONE_APP_KEY = '7705976ca6e85fe7b86d6bc2d11f7783'
 
-#验证码超时时间
+# 验证码超时时间
 AuthCode_Expire = 600
 
 RTMP_PUSH_URL = 'http://13.56.215.252:8091/hls'
@@ -48,26 +47,39 @@ BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 # uid token key
 UID_TOKEN_KEY = 'c+565*j@%^'
 
-
 if SERVER_TYPE == 'Ansjer.local_settings':
     NGINX_RTMP_STAT = 'http://192.168.136.45:8077/stat'
     SERVER_DOMAIN = 'http://192.168.136.45:8077/'
     SERVER_HOST = '192.168.136.45'
     DOMAIN_HOST = '192.168.136.45'
     RTMP_PUSH_URL = 'rtmp://192.168.136.45:1935/hls'
+    PAYPAL_CRD = {
+        "mode": "sandbox",  # sandbox or live
+        "client_id": "AeuhR7FHisO-lOd2OwtzyDu7PSLMmDZoDLgmzuEQ12WCtTu_8Z1AzcD4gG5SnymnuvJs-n5KBB8H9Z_G",
+        "client_secret": "EGkMCB3RWTcUGJGDYahJ9mCO0AQzEn2AvFfx1GAFjfyyn7-8a0NObcZks89QorlFpvNWTsDXVa2INRNM"
+    }
 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'
     SERVER_HOST = 'localhost'
+    PAYPAL_CRD = {
+        "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'
     SERVER_DOMAIN = 'http://www.dvema.com/'
     DOMAIN_HOST = 'www.dvema.com'
     SERVER_HOST = 'localhost'
+    PAYPAL_CRD = {
+        "mode": "live",  # sandbox or live
+        "client_id": "AdSRd6WBn-qLl9OiQHQuNYTDFSx0ZX0RUttqa58au8bPzoGYQUrt8bc6591RmH8_pEAIPijdvVYSVXyI",
+        "client_secret": "ENT-J08N3Fw0B0uAokg4RukljAwO9hFHPf8whE6-Dwd8oBWJO8AWMgpdTKpfB1pOy89t4bsFEzMWDowm"
+    }
 
 # oss param
 OSS_STS_ACCESS_KEY = 'LTAIyMkGfEdogyL9'
 OSS_STS_ACCESS_SECRET = '71uIjpsqVOmF7DAITRyRuc259jHOjO'
 OSS_ROLE_ARN = 'acs:ram::1901342792446414:role/stsoss'
-

Controller/CloudVod.py

@@ -25,7 +25,7 @@ from django.utils.decorators import method_decorator
 from django.views.decorators.csrf import csrf_exempt
 from django.views.generic.base import View
 
-from Ansjer.config import OSS_STS_ACCESS_KEY, OSS_STS_ACCESS_SECRET, OSS_ROLE_ARN, SERVER_DOMAIN
+from Ansjer.config import OSS_STS_ACCESS_KEY, OSS_STS_ACCESS_SECRET, OSS_ROLE_ARN, SERVER_DOMAIN,PAYPAL_CRD
 from Model.models import Device_Info, Order_Model, Store_Meal, VodHlsModel, OssCrdModel, UID_Bucket
 from Object.ResponseObject import ResponseObject
 from Object.TokenObject import TokenObject
@@ -233,11 +233,7 @@ class CloudVodView(View):
         call_clc_url = "{SERVER_DOMAIN}cloudVod/payError".format(SERVER_DOMAIN=SERVER_DOMAIN)
         # call_clc_url = "{SERVER_DOMAIN}cloudVod/cancleorder?orderID={orderID}". \
         #     format(SERVER_DOMAIN=SERVER_DOMAIN, orderID=orderID)
-        paypalrestsdk.configure({
-            "mode": "sandbox",  # sandbox or live
-            "client_id": "AeuhR7FHisO-lOd2OwtzyDu7PSLMmDZoDLgmzuEQ12WCtTu_8Z1AzcD4gG5SnymnuvJs-n5KBB8H9Z_G",
-            "client_secret": "EGkMCB3RWTcUGJGDYahJ9mCO0AQzEn2AvFfx1GAFjfyyn7-8a0NObcZks89QorlFpvNWTsDXVa2INRNM"
-        })
+        paypalrestsdk.configure(PAYPAL_CRD)
         payment = paypalrestsdk.Payment({
             "intent": "sale",
             "payer": {"payment_method": "paypal"},
@@ -406,12 +402,7 @@ class CloudVodView(View):
         if not paymentId or not PayerID or not orderID:
             red_url = "{SERVER_DOMAIN}cloudVod/payError".format(SERVER_DOMAIN=SERVER_DOMAIN)
             return HttpResponseRedirect(red_url)
-            # return response.json(444, 'paymentId,PayerID,orderID')
-        paypalrestsdk.configure({
-            "mode": "sandbox",  # sandbox or live
-            "client_id": "AeuhR7FHisO-lOd2OwtzyDu7PSLMmDZoDLgmzuEQ12WCtTu_8Z1AzcD4gG5SnymnuvJs-n5KBB8H9Z_G",
-            "client_secret": "EGkMCB3RWTcUGJGDYahJ9mCO0AQzEn2AvFfx1GAFjfyyn7-8a0NObcZks89QorlFpvNWTsDXVa2INRNM"
-        })
+        paypalrestsdk.configure(PAYPAL_CRD)
         # ID of the payment. This ID is provided when creating payment.
         payment = paypalrestsdk.Payment.find(paymentId)
         payres = payment.execute({"payer_id": PayerID})

Object/TokenObject.py

@@ -21,7 +21,7 @@ class TokenObject:
 
     def __init__(self, token=None):
         if token == 'local':
-            token = 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1c2VySUQiOiIxNTQzOTA5MDUwNDEzMTM4MDAxMzgwMDAiLCJsYW5nIjoiZW4iLCJ1c2VyIjoiMTM4MDAxMzgwMDEiLCJleHAiOjE1NDc2MjA2ODR9.mwqBOK0v0C4ww4hSiXIVmJGpxQLeIW92J1cxYquFxUg'
+            token = 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1c2VySUQiOiIxNTQzOTA5MDUwNDEzMTM4MDAxMzgwMDAiLCJsYW5nIjoiZW4iLCJ1c2VyIjoiMTM4MDAxMzgwMDEiLCJleHAiOjE1NDgzMDA0MDV9.bsPkGbiHFjamv7JpYpUwRNi2QONfisvEByacA30abts'
         if token == 'test':
             token = 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySUQiOiIxNTE1NjQyNjIzMzc5Mzk1MTM4MDAxMzgwMDEiLCJleHAiOjE1NDc2MjA5NTYsImxhbmciOiJlbiIsInVzZXIiOiIxMzgwMDEzODAwMSJ9.RTNlCl5Xn9fRvqLLsNbJPS0vTRUiZHCzlHKizFgm6yc'
         self.token = token