yf_yzl 2 rokov pred
rodič
commit
b2d1223ad2
1 zmenil súbory, kde vykonal 15 pridanie a 13 odobranie
  1. 15 13
      crond_script/crond_weather.py

+ 15 - 13
crond_script/crond_weather.py

@@ -78,6 +78,20 @@ def init_data():
 
 def main():
     logging.warning("up today ...")
+    server_days = ServerDayData.objects.all()
+    for server_day_obj in server_days:
+        server_day_url = f"http://v0.yiketianqi.com/api?unescape=1&version=v91&appid=69334222&appsecret=2u4bHXHD&cityid={server_day_obj.cityid}&ext=hours,aqi,life"
+        server_day_response = requests.get(server_day_url, timeout=5)
+        try:
+            server_day_data = json.loads(server_day_response.text)
+            if "errcode" not in server_day_data.keys():
+                server_day_obj.content = str(server_day_data)
+                server_day_obj.save()
+        except Exception as e:
+            logging.warning(f"cityid {server_day_obj.cityid}  error {e} {today_response.text}")
+        time.sleep(random.randint(1, 5))
+    logging.warning("over server day ...")
+
     day_data = DayData.objects.all()
     for day_obj in day_data:
         today_url = f"http://v0.yiketianqi.com/api?unescape=1&version=v62&appid=69334222&appsecret=2u4bHXHD&cityid={day_obj.cityid}"
@@ -92,19 +106,7 @@ def main():
         time.sleep(random.randint(1, 5))
     logging.warning("over today ...")
     logging.warning("up server day ...")
-    server_days = ServerDayData.objects.all()
-    for server_day_obj in server_days:
-        server_day_url = f"http://v0.yiketianqi.com/api?unescape=1&version=v91&appid=69334222&appsecret=2u4bHXHD&cityid={server_day_obj.cityid}&ext=hours,aqi,life"
-        server_day_response = requests.get(server_day_url, timeout=5)
-        try:
-            server_day_data = json.loads(server_day_response.text)
-            if "errcode" not in server_day_data.keys():
-                server_day_obj.content = str(server_day_data)
-                server_day_obj.save()
-        except Exception as e:
-            logging.warning(f"cityid {server_day_obj.cityid}  error {e} {today_response.text}")
-        time.sleep(random.randint(1, 5))
-    logging.warning("over server day ...")
+
 
     """
     district = District.objects.all()