chenjunkai 6 anni fa
parent
commit
bceccc1919
4 ha cambiato i file con 40 aggiunte e 11 eliminazioni
  1. 6 6
      Ansjer/config.py
  2. 32 3
      Controller/Test.py
  3. 1 1
      Controller/alipay_public_2048.pem
  4. 1 1
      Model/models.py

+ 6 - 6
Ansjer/config.py

@@ -64,12 +64,12 @@ elif SERVER_TYPE == 'Ansjer.test_settings':
     DOMAIN_HOST = 'test.dvema.com'
     SERVER_HOST = 'localhost'
     PAYPAL_CRD = {
-        # "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"
+        "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'

+ 32 - 3
Controller/Test.py

@@ -30,7 +30,7 @@ class Test(View):
         alipay_public_key_string = open(BASE_DIR + '/Controller/alipay_public_2048.pem').read()
         orderID = int(time.time())+int(time.time())
         alipay = AliPay(
-            appid="2016092200569234",
+            appid="2017080107983629",
             app_notify_url=None,  # the default notify path
             app_private_key_string=app_private_key_string,
             # alipay public key, do not use your own public key!
@@ -49,8 +49,37 @@ class Test(View):
         from django.http import HttpResponseRedirect
         # return response.json(0,"https://openapi.alipay.com/gateway.do? + {order_string}".format(order_string=order_string))
         print(order_string)
-        return HttpResponseRedirect("https://openapi.alipaydev.com/gateway.do?"+order_string)
-        # 增加
+        return HttpResponseRedirect("https://openapi.alipay.com/gateway.do?"+order_string)
+    #     # 增加
+    # def get(self, request, *args, **kwargs):
+    #     response = ResponseObject()
+    #     from alipay import AliPay, ISVAliPay
+    #     import time
+    #     app_private_key_string = open(BASE_DIR + '/Controller/alipay_private_2048.pem').read()
+    #     alipay_public_key_string = open(BASE_DIR + '/Controller/alipay_public_2048.pem').read()
+    #     orderID = int(time.time())+int(time.time())
+    #     alipay = AliPay(
+    #         appid="2016092200569234",
+    #         app_notify_url=None,  # the default notify path
+    #         app_private_key_string=app_private_key_string,
+    #         # alipay public key, do not use your own public key!
+    #         alipay_public_key_string=alipay_public_key_string,
+    #         sign_type="RSA",  # RSA or RSA2
+    #         debug=False  # False by default
+    #     )
+    #     order_string = alipay.api_alipay_trade_wap_pay(
+    #         out_trade_no=str(orderID),
+    #         total_amount=0.01,
+    #         subject="实用性充气版玩具",
+    #         return_url="https://test.dvema.com",
+    #         # notify_url="https://example.com/notify"  # this is optional
+    #     )
+    #     print(order_string)
+    #     from django.http import HttpResponseRedirect
+    #     # return response.json(0,"https://openapi.alipay.com/gateway.do? + {order_string}".format(order_string=order_string))
+    #     print(order_string)
+    #     return HttpResponseRedirect("https://openapi.alipaydev.com/gateway.do?"+order_string)
+    #     # 增加
 
     def post(self, request, *args, **kwargs):
         response = ResponseObject()

+ 1 - 1
Controller/alipay_public_2048.pem

@@ -1,3 +1,3 @@
 -----BEGIN PUBLIC KEY-----
-MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCeA9F/gHJtHaBRoXR2TI/Xwh+t1CqlVB6zqRya8AYkAqNAhK0MV9sXi2Z9f2icUigGY2+/fVGkmAMhdcpPLyAjXS4wA5L5qK/Ne4b5yEr9jd9NeY3T4EGoBga5OjTj0LUf10L7OMjgrddcsKE2/XQG8x/2d8tmc/S+01Wc+DJ/SwIDAQAB
+MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDDI6d306Q8fIfCOaTXyiUeJHkrIvYISRcc73s3vF1ZT7XN8RNPwJxo8pWaJMmvyTn9N4HQ632qJBVHf8sxHi/fEsraprwCtzvzQETrNRwVxLO5jVmRGi60j8Ue1efIlzPXV9je9mkjzOmdssymZkh2QhUrCmZYI/FCEa3/cNMW0QIDAQAB
 -----END PUBLIC KEY-----

+ 1 - 1
Model/models.py

@@ -512,7 +512,7 @@ class VodHlsModel(models.Model):
     id = models.AutoField(primary_key=True, verbose_name='回放列表主键')
     uid = models.CharField(max_length=20, verbose_name='设备UID')
     channel = models.SmallIntegerField(default=0, verbose_name='通道')
-    time = models.IntegerField(verbose_name='播放列表名字时间戳', default=0)
+    time = models.IntegerField(verbose_name='播放列表名字时间戳', default=0,db_index=True)
     endTime = models.IntegerField(verbose_name='删除时间', default=0)
     sec = models.IntegerField(verbose_name='秒数', default=0)
     bucket = models.ForeignKey(VodBucketModel, blank=True, to_field='id', on_delete=models.CASCADE, default=1,