Selaa lähdekoodia

处理拼接路径问题

peng 3 vuotta sitten
vanhempi
commit
ad7b64e0ff

+ 1 - 1
AdminController/dataSystemManagement/BusinessDataController.py

@@ -97,7 +97,7 @@ class BusinessDataView(View):
             device_count = 0
             device_count = 0
             vod_list = []
             vod_list = []
             for url in url_list:
             for url in url_list:
-                url = url + request.path
+                url = url + request.path.replace('global/', '')
                 res = requests.get(url=url, params=request_dict, headers=headers)
                 res = requests.get(url=url, params=request_dict, headers=headers)
                 result = res.json()
                 result = res.json()
                 if result['result_code'] == 0:
                 if result['result_code'] == 0:

+ 3 - 7
AdminController/dataSystemManagement/HomeDataController.py

@@ -155,7 +155,7 @@ class HomeDataView(View):
             ai_order_all_total = 0
             ai_order_all_total = 0
             unicom_order_all_total = 0
             unicom_order_all_total = 0
             for url in url_list:
             for url in url_list:
-                url = url + request.path
+                url = url + request.path.replace('global/', '')
                 res = requests.get(url=url, params=request_dict, headers=headers)
                 res = requests.get(url=url, params=request_dict, headers=headers)
                 result = res.json()
                 result = res.json()
                 user_increase_count += result['result']['userIncreaseCount']
                 user_increase_count += result['result']['userIncreaseCount']
@@ -201,18 +201,14 @@ class HomeDataView(View):
         @param response:响应对象
         @param response:响应对象
         @return:
         @return:
         """
         """
-        ap_url = 'https://www.zositechc.cn/dataManagement/homeData/salesVolume'
-        as_url = 'https://www.zositecha.com/dataManagement/homeData/salesVolume'
-        na_url = 'https://www.dvema.com/dataManagement/homeData/salesVolume'
-        eu_url = 'https://www.zositeche.com/dataManagement/homeData/salesVolume'
-        local_url = 'http://127.0.0.1:8000/dataManagement/homeData/salesVolume'
-        url_list = [local_url]
+        url_list = CommonService.get_domain_name()
         try:
         try:
             headers = {
             headers = {
                 'Authorization': request.META.get('HTTP_AUTHORIZATION')
                 'Authorization': request.META.get('HTTP_AUTHORIZATION')
             }
             }
             order_list = []
             order_list = []
             for url in url_list:
             for url in url_list:
+                url = url + request.path.replace('global/', '')
                 res = requests.get(url=url, params=request_dict, headers=headers)
                 res = requests.get(url=url, params=request_dict, headers=headers)
                 result = res.json()
                 result = res.json()
                 for item in result['result']:
                 for item in result['result']:

+ 4 - 4
AdminController/dataSystemManagement/ServiceDataController.py

@@ -450,7 +450,7 @@ class ServiceDataView(View):
             store_meal_list = []
             store_meal_list = []
             store_meal_count = 0
             store_meal_count = 0
             for url in url_list:
             for url in url_list:
-                url = url + request.path
+                url = url + request.path.replace('global/', '')
                 res = requests.get(url=url, params=request_dict, headers=headers)
                 res = requests.get(url=url, params=request_dict, headers=headers)
                 result = res.json()
                 result = res.json()
                 if result['result_code'] == 0:
                 if result['result_code'] == 0:
@@ -546,7 +546,7 @@ class ServiceDataView(View):
             device_type_list = []
             device_type_list = []
             device_type_count = 0
             device_type_count = 0
             for url in url_list:
             for url in url_list:
-                url = url + request.path
+                url = url + request.path.replace('global/', '')
                 res = requests.get(url=url, params=request_dict, headers=headers)
                 res = requests.get(url=url, params=request_dict, headers=headers)
                 result = res.json()
                 result = res.json()
                 if result['result_code'] == 0:
                 if result['result_code'] == 0:
@@ -621,7 +621,7 @@ class ServiceDataView(View):
             device_type_list = []
             device_type_list = []
             device_type_count = 0
             device_type_count = 0
             for url in url_list:
             for url in url_list:
-                url = url + request.path
+                url = url + request.path.replace('global/', '')
                 res = requests.get(url=url, params=request_dict, headers=headers)
                 res = requests.get(url=url, params=request_dict, headers=headers)
                 result = res.json()
                 result = res.json()
                 if result['result_code'] == 0:
                 if result['result_code'] == 0:
@@ -698,7 +698,7 @@ class ServiceDataView(View):
             repeat_count = 0
             repeat_count = 0
             order_count = 0
             order_count = 0
             for url in url_list:
             for url in url_list:
-                url = url + request.path
+                url = url + request.path.replace('global/', '')
                 res = requests.get(url=url, params=request_dict, headers=headers)
                 res = requests.get(url=url, params=request_dict, headers=headers)
                 result = res.json()
                 result = res.json()
                 if result['result_code'] == 0:
                 if result['result_code'] == 0:

+ 3 - 3
AdminController/dataSystemManagement/UserDataController.py

@@ -206,7 +206,7 @@ class UserDataView(View):
             region_list = []
             region_list = []
             region_count = 0
             region_count = 0
             for url in url_list:
             for url in url_list:
-                url = url + request.path
+                url = url + request.path.replace('global/', '')
                 res = requests.get(url=url, params=request_dict, headers=headers)
                 res = requests.get(url=url, params=request_dict, headers=headers)
                 result = res.json()
                 result = res.json()
                 if result['result_code'] == 0:
                 if result['result_code'] == 0:
@@ -265,7 +265,7 @@ class UserDataView(View):
             region_list = []
             region_list = []
             region_count = 0
             region_count = 0
             for url in url_list:
             for url in url_list:
-                url = url + request.path
+                url = url + request.path.replace('global/', '')
                 res = requests.get(url=url, params=request_dict, headers=headers)
                 res = requests.get(url=url, params=request_dict, headers=headers)
                 result = res.json()
                 result = res.json()
                 if result['result_code'] == 0:
                 if result['result_code'] == 0:
@@ -322,7 +322,7 @@ class UserDataView(View):
             user_list = []
             user_list = []
             user_count = 0
             user_count = 0
             for url in url_list:
             for url in url_list:
-                url = url + request.path
+                url = url + request.path.replace('global/', '')
                 res = requests.get(url=url, headers=headers)
                 res = requests.get(url=url, headers=headers)
                 result = res.json()
                 result = res.json()
                 if result['result_code'] == 0:
                 if result['result_code'] == 0: