tt

Ansjer/config.py

@@ -56,6 +56,7 @@ 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_DOMAIN_SSL = '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'
@@ -67,6 +68,8 @@ if SERVER_TYPE == 'Ansjer.local_settings':
 elif SERVER_TYPE == 'Ansjer.test_settings':
     NGINX_RTMP_STAT = 'http://test.dvema.com/stat'
     SERVER_DOMAIN = 'http://test.dvema.com/'
+    SERVER_DOMAIN_SSL = 'https://test.dvema.com/'
+
     DOMAIN_HOST = 'test.dvema.com'
     SERVER_HOST = 'localhost'
     PAYPAL_CRD = {
@@ -80,6 +83,7 @@ elif SERVER_TYPE == 'Ansjer.test_settings':
 elif SERVER_TYPE == 'Ansjer.formal_settings':
     NGINX_RTMP_STAT = 'http://www.dvema.com/stat'
     SERVER_DOMAIN = 'http://www.dvema.com/'
+    SERVER_DOMAIN_SSL = 'https://www.dvema.com/'
     DOMAIN_HOST = 'www.dvema.com'
     SERVER_HOST = 'localhost'
     PAYPAL_CRD = {

Controller/CloudVod.py

@@ -27,7 +27,7 @@ from django.views.generic.base import View
 from alipay import AliPay
 
 from Ansjer.config import BASE_DIR
-from Ansjer.config import OSS_STS_ACCESS_KEY, OSS_STS_ACCESS_SECRET, OSS_ROLE_ARN, SERVER_DOMAIN, PAYPAL_CRD
+from Ansjer.config import OSS_STS_ACCESS_KEY, OSS_STS_ACCESS_SECRET, OSS_ROLE_ARN, SERVER_DOMAIN, PAYPAL_CRD,SERVER_DOMAIN_SSL
 from Model.models import Device_Info, Order_Model, Store_Meal, VodHlsModel, OssCrdModel, UID_Bucket
 from Object.ResponseObject import ResponseObject
 from Object.TokenObject import TokenObject
@@ -132,11 +132,14 @@ class CloudVodView(View):
         print(json.dumps(data))
         print(signature)
         # verify
-        app_private_key_string = open(BASE_DIR + '/Ansjer/file/alipay/zosi_alipay_private_2048.pem').read()
-        alipay_public_key_string = open(BASE_DIR + '/Ansjer/file/alipay/zosi_alipay_public_2048.pem').read()
+
+        app_private_key_string = open(BASE_DIR + '/Ansjer/file/alipay/alipay_private_2048.pem').read()
+        alipay_public_key_string = open(BASE_DIR + '/Ansjer/file/alipay/alipay_public_2048.pem').read()
+        # app_private_key_string = open(BASE_DIR + '/Ansjer/file/alipay/zosi_alipay_private_2048.pem').read()
+        # alipay_public_key_string = open(BASE_DIR + '/Ansjer/file/alipay/zosi_alipay_public_2048.pem').read()
         alipay = AliPay(
-            # appid="2016092200569234",
-            appid="2019041663958142",
+            appid="2016092200569234",
+            # appid="2019041663958142",
             app_notify_url=None,  # the default notify path
             app_private_key_string=app_private_key_string,
             alipay_public_key_string=alipay_public_key_string,
@@ -224,14 +227,14 @@ class CloudVodView(View):
         nowTime = int(time.time())
         # 新增流程
         orderID = CommonService.createOrderID()
-        # app_private_key_string = open(BASE_DIR + '/Ansjer/file/alipay/alipay_private_2048.pem').read()
-        # alipay_public_key_string = open(BASE_DIR + '/Ansjer/file/alipay/alipay_public_2048.pem').read()
-        app_private_key_string = open(BASE_DIR + '/Ansjer/file/alipay/zosi_alipay_private_2048.pem').read()
-        alipay_public_key_string = open(BASE_DIR + '/Ansjer/file/alipay/zosi_alipay_public_2048.pem').read()
+        # app_private_key_string = open(BASE_DIR + '/Ansjer/file/alipay/zosi_alipay_private_2048.pem').read()
+        # alipay_public_key_string = open(BASE_DIR + '/Ansjer/file/alipay/zosi_alipay_public_2048.pem').read()
+        app_private_key_string = open(BASE_DIR + '/Ansjer/file/alipay/alipay_private_2048.pem').read()
+        alipay_public_key_string = open(BASE_DIR + '/Ansjer/file/alipay/alipay_public_2048.pem').read()
         try:
             alipay = AliPay(
-                # appid="2016092200569234",
-                appid="2019041663958142",
+                appid="2016092200569234",
+                # appid="2019041663958142",
                 app_notify_url=None,  # the default notify path
                 app_private_key_string=app_private_key_string,
                 alipay_public_key_string=alipay_public_key_string,
@@ -248,19 +251,6 @@ class CloudVodView(View):
                 # return_url="http://192.168.136.40/cloudVod/payOK",
                 # notify_url="http://192.168.136.40/cloudVod/aliPayCallback"
             )
-            # app_pay = alipay.api_alipay_trade_app_pay(
-            #     out_trade_no=orderID,
-            #     total_amount=price,
-            #     subject="oeo",
-            #     return_url="https://test.dvema.com/cloudVod/payOK",
-            #     notify_url="https://test.dvema.com/cloudVod/aliPayCallback"
-            # )
-            # order_string = alipay.api_alipay_trade_page_pay(
-            #     out_trade_no=orderID,
-            #     total_amount=price,
-            #     subject="实用性充气式玩具",
-            #     return_url="https://test.dvema.com/cloudVod/payOK",
-            #     notify_url="https://test.dvema.com/cloudVod/aliPayCallback")
         except Exception as e:
             print(repr(e))
             return response.json(10, repr(e))