Merge branch 'dev' of http://192.168.136.99:3000/SERVER/AnsjerServer into bin

Ansjer/test_zositech_help_weekly_task.py

@@ -15,32 +15,32 @@ data = {
     'userName': username,
     'userPwd': password
 }
-res = requests.post(url=login_url, data=data)
+res = requests.post(url=login_url, data=data, timeout=10)
 res = res.json()
 
 if res['result_code'] == 0:
-    isbool = True
-    while isbool:
+    request_times = 0
+    while request_times < 5:
         try:
             statistics_url = base_url + 'faq/synZositechHelp'
-            zhcnDatares = requests.get(
-                url='https://mobileapphelp.zendesk.com/api/v2/help_center/articles/embeddable_search.json?locale=zh-cn&section=null&origin=web_widget', timeout=1).text
-
-            enusDatares = requests.get(
-                url='https://mobileapphelp.zendesk.com/api/v2/help_center/articles/embeddable_search.json?locale=en-us&section=null&origin=web_widget', timeout=1).text
+            # zh_url = 'https://mobileapphelp.zendesk.com/api/v2/help_center/articles/embeddable_search.json?locale=zh-cn&section=null&origin=web_widget'
+            zh_url = 'https://mobileapphelp.zendesk.com/api/v2/help_center/en-us/articles.json?page%5Bsize%5D=100'
+            zhcnDatares = requests.get(url=zh_url, timeout=10).text
 
+            en_url = 'https://mobileapphelp.zendesk.com/api/v2/help_center/en-us/articles.json?page%5Bsize%5D=100'
+            # en_url = 'https://mobileapphelp.zendesk.com/api/v2/help_center/articles/embeddable_search.json?locale=en-us&section=null&origin=web_widget'
+            enusDatares = requests.get(url=en_url, timeout=10).text
             data = {
                 'token': res['result']['access_token'],
                 'zhresults': zhcnDatares,
                 'enresults': enusDatares
             }
-            isbool = False
             res = requests.post(url=statistics_url, data=data)
 
         except Exception as e:
-            isbool=True
+            print(e)
+            request_times += 1
+            print(request_times)
             time.sleep(3)
 
 
-
-

Controller/FAQController.py

@@ -360,7 +360,7 @@ class FAQView(View):
 
         ZositechHelpModel.objects.all().delete()
 
-        for data in zhresults['results']:
+        for data in zhresults['articles']:
             labname = ""
             if data['label_names']:
                 for lab in data['label_names']:
@@ -375,7 +375,7 @@ class FAQView(View):
                 'origin': 'web_widget',
                 'content': json.dumps(data).replace("\'", "\"").replace("XX??????XX", "\'")
             })
-        for data in enresults['results']:
+        for data in enresults['articles']:
             labname = ""
             if data['label_names']:
                 for lab in data['label_names']:

Controller/OrderContrller.py

@@ -110,7 +110,7 @@ class OrderView(View):
                                                               "updTime", "paypal", "rank__day", "payType",
                                                               "rank__price", "status",
                                                               "rank__content", "rank__title", "rank__currency",
-                                                              "rank_id")
+                                                              "rank_id","rank__expire")
         order_list = list(order_ql)
         data = []
         nowTime = int(time.time())
@@ -128,6 +128,7 @@ class OrderView(View):
                     d['did'] = did['id']
                     d['Type'] = did['Type']
                     data.append(d)
+            d['rank__expire_unit'] = '月' if lang == 'cn' else 'month'
         return response.json(0, {'data': data, 'count': count})
 
     # admins ^^^^^^^^^^^^