Merge branch 'master' of http://code.nyzhwlw.com:10202/yf_fyh/bigdataAPI

crond_script/cbd_analysis.py

@@ -107,6 +107,6 @@ def get_cbd_data(devices, start, end):
 
 if __name__ == '__main__':
     devices = device_info(f"{BASE_DIR}/crond_script/find_query.xlsx")
-    get_cbd_data(devices, "2024-01-01", "2024-12-31")
+    get_cbd_data(devices, "2023-01-01", "2023-12-31")
     # init_henan_addr()
-    
+    

crond_script/nd_qxz_data.py

@@ -175,4 +175,4 @@ def main(start_y, end_y):
 
 
 if __name__ == '__main__':
-    main(2024, 2025)
+    main(2023, 2024)

crond_script/server_weather.py

@@ -79,7 +79,7 @@ def main():
         try:
             time_out_k = False 
             print(server_day_obj.cityid)
-            server_day_url = f"http://v1.yiketianqi.com/api?unescape=1&version=v91&appid=69334222&appsecret=2ME6U58N&cityid={server_day_obj.cityid}&ext=hours,aqi,life"
+            server_day_url = f"http://gfeljm.tianqiapi.com/api?unescape=1&version=v91&appid=69334222&appsecret=2ME6U58N&cityid={server_day_obj.cityid}&ext=hours,aqi,life"
             server_day_response = requests.get(server_day_url, headers=headers, timeout=10)
             server_ct += 1
         

crond_script/today_weather.py

@@ -97,7 +97,7 @@ def main():
         try:        
             time_out = False 
             print(day_obj.cityid)
-            today_url = f"http://v1.yiketianqi.com/api?unescape=1&version=v62&appid=69334222&appsecret=2ME6U58N&cityid={day_obj.cityid}"
+            today_url = f"http://gfeljm.tianqiapi.com/api?unescape=1&version=v62&appid=69334222&appsecret=2ME6U58N&cityid={day_obj.cityid}"
             today_response = requests.get(today_url, headers=headers, timeout=10)
             if today_response.status_code == 200:
                 today_data = json.loads(today_response.text)