lang 3 éve
szülő
commit
a96971fb1a

+ 40 - 1
AdminController/TestServeController.py

@@ -22,17 +22,20 @@ from time import strftime
 from Ansjer.config import BASE_DIR
 from Object import MergePic
 import os
+import base64
 
 
 class TestServeView(View):
     def get(self, request, *args, **kwargs):
         request.encoding = 'utf-8'
         operation = kwargs.get('operation')
+        print("--------------------get")
         return self.validation(request.GET, request, operation)
 
     def post(self, request, *args, **kwargs):
         request.encoding = 'utf-8'
         operation = kwargs.get('operation')
+        print("--------------------post")
         return self.validation(request.POST, request, operation)
 
     def validation(self, request_dict, request, operation):
@@ -58,11 +61,47 @@ class TestServeView(View):
                 return response.json(404)
 
     def AItest(self, userID, request, request_dict, response):
-        file = request.FILES.get('file', None)
+        # print("--------------request_dict")
+        # print(request_dict)
+
+        file_post_one = request_dict.get('file_one', None)
+        file_post = file_post_one.replace(' ','+')
+        # file_decode = base64.b64decode(file_post)
+
+        file_post_two = request_dict.get('file_two', None)
+        file_post_two = file_post_two.replace(' ', '+')
+        # file_decode_two = base64.b64decode(file_post_two)
+
+        now_time = int(time.time())
+        dir_path = os.path.join(BASE_DIR, 'static/ai/')
+        if not os.path.exists(dir_path):
+            os.makedirs(dir_path)
+
+        file_path_one = dir_path + 'one'+ str(now_time) + '.jpeg'
+        file_path_two = dir_path + 'two'+ str(now_time) + '.jpeg'
+
+        file_list = ['one','two']
+
+        for index in file_list:
+            file_path = dir_path + index + str(now_time) + '.jpeg'
+            with open(file_path, 'wb') as f:
+                # file_byte = file_post.encode('utf-8')
+                f.write(file_decode)
+
+
+
+
+        return HttpResponse("seccess")
         file2 = request.FILES.get('file_one', None)
         file3 = request.FILES.get('file_two', None)
         file4 = request.FILES.get('file_three', None)
 
+        print('--------------------------file')
+        print(file)
+
+        print('===========================post_file')
+        print(file_post)
+
         post_file_list = [file, file2, file3, file4]
         file_list = []
         for index in range(len(post_file_list)):

+ 6 - 5
Ansjer/local_config/config_local.py

@@ -6,9 +6,9 @@ import os
 OAUTH_ACCESS_TOKEN_SECRET = 'local_a+jbgnw%@1%zy^=@dn62%'
 OAUTH_REFRESH_TOKEN_SECRET = 'local_r+jbgnw%@1%zy^=@dn62%'
 
-NGINX_RTMP_STAT = 'http://127.0.0.1:8077/stat'
-SERVER_DOMAIN = 'http://127.0.0.1:8077/'
-SERVER_DOMAIN_SSL = 'http://127.0.0.1:8077/'
+NGINX_RTMP_STAT = 'http://127.0.0.1:8000/stat'
+SERVER_DOMAIN = 'http://127.0.0.1:8000/'
+SERVER_DOMAIN_SSL = 'http://127.0.0.1:8000/'
 SERVER_HOST = '127.0.0.1'
 DOMAIN_HOST = '127.0.0.1'
 PUSH_REDIS_ADDRESS = '127.0.0.1'
@@ -17,9 +17,10 @@ PUSH_REDIS_ADDRESS = '127.0.0.1'
 RTMP_PUSH_URL = 'rtmp://127.0.0.1:1935/hls'
 PAYPAL_CRD = {
     "mode": "sandbox",  # sandbox or live
-    "client_id": "AeuhR7FHisO-lOd2OwtzyDu7PSLMmDZoDLgmzuEQ12WCtTu_8Z1AzcD4gG5SnymnuvJs-n5KBB8H9Z_G",
-    "client_secret": "EGkMCB3RWTcUGJGDYahJ9mCO0AQzEn2AvFfx1GAFjfyyn7-8a0NObcZks89QorlFpvNWTsDXVa2INRNM"
+    "client_id": "AVLoQVq3xHZ6FrF4mxHwlCPgVBAw4Fw5RtMkuxmYd23SkUTIY643n2g3KdK-Al8wV05I28lza5uoQbAA",
+    "client_secret": "EO8kRc8yioDk0i2Qq-QMcVFfwkmyMJorTvBSLDTnxDJJ_wb9VoM_0jkUY9iEng2Flp1ze8wQOGpH5nB2"
 }
+PAYPAL_WEB_HOOK_ID = '6TS30758D98835230'
 DETECT_PUSH_DOMAIN = 'http://test.push.dvema.com/'
 DETECT_PUSH_DOMAINS = 'https://test.push.dvema.com/'
 DETECT_PUSH_DOMAIN_JIUAN = 'http://jiuan.push.dvema.com/'

+ 30 - 31
Ansjer/local_config/local_settings.py

@@ -96,23 +96,22 @@ WSGI_APPLICATION = 'Ansjer.local_config.local_wsgi.application'
 # DATABASES_PASS = 'UKv78ezQhiGMmSef5U5s'
 
 # 本地数据库
-DATABASE_DATA = 'ansjer'
+DATABASE_DATA = 'ansjer_test'
 SERVER_HOST = '127.0.0.1'
 DATABASES_USER = 'root'
-DATABASES_PASS = '123456'
+DATABASES_PASS = 'root'
 
 # 推送数据库
-DATABASE_DATA2 = 'push'
-SERVER_HOST2 = '127.0.0.1'
-DATABASES_USER2 = 'root'
-DATABASES_PASS2 = '123456'
+# DATABASE_DATA2 = 'ansjerpush'
+# SERVER_HOST2 = '127.0.0.1'
+# DATABASES_USER2 = 'root'
+# DATABASES_PASS2 = 'root'
 
 # 序列号公共数据库
-DATABASE_DATA3 = 'serial'
-SERVER_HOST3 = '127.0.0.1'
-DATABASES_USER3 = 'root'
-DATABASES_PASS3 = '123456'
-
+# DATABASE_DATA3 = 'ansjer_test'
+# SERVER_HOST3 = '127.0.0.1'
+# DATABASES_USER3 = 'root'
+# DATABASES_PASS3 = '123456'
 DATABASES = {
     'default': {
         'ENGINE': 'django.db.backends.mysql',
@@ -124,26 +123,26 @@ DATABASES = {
         'OPTIONS': {'charset': 'utf8mb4', 'use_unicode': True, 'init_command': "SET sql_mode='STRICT_TRANS_TABLES'"},
         'AUTOCOMMIT': True
     },
-    'mysql02': {
-        'ENGINE': 'django.db.backends.mysql',
-        'NAME': DATABASE_DATA2,
-        'USER': DATABASES_USER2,
-        'PASSWORD': DATABASES_PASS2,
-        'HOST': SERVER_HOST2,
-        'PORT': '3306',
-        'OPTIONS': {'charset': 'utf8mb4', 'use_unicode': True, 'init_command': "SET sql_mode='STRICT_TRANS_TABLES'"},
-        'AUTOCOMMIT': True
-    },
-    'mysql03': {
-        'ENGINE': 'django.db.backends.mysql',
-        'NAME': DATABASE_DATA3,
-        'USER': DATABASES_USER3,
-        'PASSWORD': DATABASES_PASS3,
-        'HOST': SERVER_HOST3,
-        'PORT': '3306',
-        'OPTIONS': {'charset': 'utf8mb4', 'use_unicode': True, 'init_command': "SET sql_mode='STRICT_TRANS_TABLES'"},
-        'AUTOCOMMIT': True
-    },
+    # 'mysql02': {
+    #     'ENGINE': 'django.db.backends.mysql',
+    #     'NAME': DATABASE_DATA2,
+    #     'USER': DATABASES_USER2,
+    #     'PASSWORD': DATABASES_PASS2,
+    #     'HOST': SERVER_HOST2,
+    #     'PORT': '3306',
+    #     'OPTIONS': {'charset': 'utf8mb4', 'use_unicode': True, 'init_command': "SET sql_mode='STRICT_TRANS_TABLES'"},
+    #     'AUTOCOMMIT': True
+    # },
+    # 'mysql03': {
+    #     'ENGINE': 'django.db.backends.mysql',
+    #     'NAME': DATABASE_DATA3,
+    #     'USER': DATABASES_USER3,
+    #     'PASSWORD': DATABASES_PASS3,
+    #     'HOST': SERVER_HOST3,
+    #     'PORT': '3306',
+    #     'OPTIONS': {'charset': 'utf8mb4', 'use_unicode': True, 'init_command': "SET sql_mode='STRICT_TRANS_TABLES'"},
+    #     'AUTOCOMMIT': True
+    # },
 }
 DATABASE_ROUTERS = ['Ansjer.database_router.DatabaseAppsRouter']
 DATABASE_APPS_MAPPING = {

+ 1 - 1
Controller/CloudStorage.py

@@ -1115,7 +1115,7 @@ class CloudStorageView(View):
             return HttpResponse(pay.xml_to_dict({'return_code': 'FAIL', 'return_msg': repr(e)}))
 
     def do_create_pay_order(self, request_dict, userID, ip, response):  # 创建支付订单
-        logger = logging.getLogger('log')
+        logger = logging.getLogger('info')
         uid = request_dict.get('uid', None)
         channel = request_dict.get('channel', None)
         pay_type = int(request_dict.get('pay_type', None))

+ 3 - 0
Controller/PaymentCycle.py

@@ -32,6 +32,7 @@ class Paypal:
 
 
     def subscriptions(store_info,lang,orderID,price):
+        logger = logging.getLogger('info')
         cycle_config = PayCycleConfigModel.objects.filter(id=store_info['cycle_config_id']).values()
         if not cycle_config:
             return False
@@ -82,6 +83,8 @@ class Paypal:
             ],
             "type": "INFINITE",
         }
+        logger.info('-------------sub.list')
+        logger.info(BillingPlan)
         paypalrestsdk.configure(PAYPAL_CRD)
         billing_plan = paypalrestsdk.BillingPlan(BillingPlan)
         if billing_plan.create():

+ 1 - 1
Controller/TestApi.py

@@ -722,7 +722,7 @@ class testView(View):
         # UserIdToken
         tko = TokenObject()
         res = tko.generate(
-            data={'userID': 160879593527813800138000, 'lang': 'cn', 'user': '597471180@qq.com', 'm_code': '123413243214'})
+            data={'userID': 162156677434713800138000, 'lang': 'cn', 'user': '3076898361@qq.com', 'm_code': '12341324321'})
         #uidToken
         # utko = UidTokenObject()
         # res = utko.generate(data={'uid': '4UZSEDP93MJ3X7YB111A','channel': 1})