diff --git a/dockerfile b/dockerfile index 44f6eaa..23cf465 100644 --- a/dockerfile +++ b/dockerfile @@ -17,4 +17,4 @@ RUN pip install --no-cache-dir -r requirements.txt -i https://pypi.tuna.tsinghua COPY . . # 运行应用程序 -ENTRYPOINT ["python3", "main.py"] \ No newline at end of file +ENTRYPOINT ["python3", "run.py"] \ No newline at end of file diff --git a/main.py b/run.py similarity index 51% rename from main.py rename to run.py index 8f55cfa..9660b51 100644 --- a/main.py +++ b/run.py @@ -3,28 +3,40 @@ import uvicorn from utils import query_weather from utils.log import Log -app = FastAPI(title="yin_home文档") +app = FastAPI() -@app.get('/weather', tags=["获取天气数据"], summary="返回实时天气数据") +@app.get('/weather') def weather(): + log = Log().getlog() response = query_weather.query_weather() - return response + log.info(response) + + return response, 200 -@app.get('/weather_all', tags=["获取天气数据"], summary="返回天气预报数据") +@app.get('/weather_all') def weather_all(): + log = Log().getlog() response = query_weather.query_weather(extensions='all') - return response + log.info(response) + + return response, 200 -@app.get('/weather_flag', tags=["获取天气数据"], summary="返回实时天气数据状态码") +@app.get('/weather_flag') def weather_flag(): log = Log().getlog() response = query_weather.query_weather() + log.info(response) weather = response['lives'][0]['weather'] - log.info(weather) - return 1 if '雨' in weather else 0 + # weather包含雨字符串 + if '雨' in weather: + log.info({"weather": 1}) + return {"weather": 1}, 200 + else: + log.info({"weather": 0}) + return {"weather": 0}, 200 if __name__ == '__main__': diff --git a/utils/query_weather.py b/utils/query_weather.py index ddc9bfd..053ed94 100644 --- a/utils/query_weather.py +++ b/utils/query_weather.py @@ -1,14 +1,12 @@ import requests -from utils.log import Log def query_weather(key="3add99f10c5144ebd64bfa0bfb6b1c20", city="420115", extensions="base", output="JSON"): - log = Log().getlog() url = "https://restapi.amap.com/v3/weather/weatherInfo" querystring = {"key": key, "city": city, "extensions": extensions, "output": output} response = requests.request("GET", url, params=querystring) - log.info(response.json()) + return response.json()