From 0b1f29371016e10989dd0caa732f15751afffce2 Mon Sep 17 00:00:00 2001 From: qiangyanwen <508737091@qq.com> Date: Sat, 18 Jun 2022 18:10:58 +0800 Subject: [PATCH] test --- logs/automation_info.log | 124 ++++++++++++++++++++++++++++++++++ repository/user_repository.py | 4 +- 2 files changed, 126 insertions(+), 2 deletions(-) diff --git a/logs/automation_info.log b/logs/automation_info.log index 2f90a1c..4031010 100644 --- a/logs/automation_info.log +++ b/logs/automation_info.log @@ -53,3 +53,127 @@ 2022-06-18 17:42:24 | MainThread:8630916608 | create_app:app:39 - INFO - Api redoc address http://192.168.0.105:8000/redoc 2022-06-18 17:42:31 | MainThread:8635708928 | :__init__:16 - INFO - start the automation service development environment 2022-06-18 17:42:31 | MainThread:8635708928 | :__init__:22 - INFO - loading environment configuration file +2022-06-18 18:01:35 | MainThread:8627639808 | :__init__:16 - INFO - start the automation service development environment +2022-06-18 18:01:35 | MainThread:8627639808 | :__init__:22 - INFO - loading environment configuration file +2022-06-18 18:01:35 | MainThread:8627639808 | create_app:app:15 - INFO - loading application configuration +2022-06-18 18:01:35 | MainThread:8627639808 | create_app:app:16 - INFO - create FastApi app object +2022-06-18 18:01:35 | MainThread:8627639808 | create_app:app:25 - INFO - Adding a New route success +2022-06-18 18:01:35 | MainThread:8627639808 | create_app:app:25 - INFO - Adding a New route success +2022-06-18 18:01:35 | MainThread:8627639808 | create_app:app:26 - INFO - Start registering middleware +2022-06-18 18:01:35 | MainThread:8627639808 | create_app:app:36 - INFO - Application started successfully:CORSMiddleware +2022-06-18 18:01:35 | MainThread:8627639808 | create_app:app:37 - INFO - Server address http://192.168.0.105:8000 +2022-06-18 18:01:35 | MainThread:8627639808 | create_app:app:38 - INFO - Api doc address http://192.168.0.105:8000/docs +2022-06-18 18:01:35 | MainThread:8627639808 | create_app:app:39 - INFO - Api redoc address http://192.168.0.105:8000/redoc +2022-06-18 18:01:35 | MainThread:8637068800 | :__init__:16 - INFO - start the automation service development environment +2022-06-18 18:01:35 | MainThread:8637068800 | :__init__:22 - INFO - loading environment configuration file +2022-06-18 18:01:36 | MainThread:8637068800 | create_app:app:15 - INFO - loading application configuration +2022-06-18 18:01:36 | MainThread:8637068800 | create_app:app:16 - INFO - create FastApi app object +2022-06-18 18:01:36 | MainThread:8637068800 | create_app:app:25 - INFO - Adding a New route success +2022-06-18 18:01:36 | MainThread:8637068800 | create_app:app:25 - INFO - Adding a New route success +2022-06-18 18:01:36 | MainThread:8637068800 | create_app:app:26 - INFO - Start registering middleware +2022-06-18 18:01:36 | MainThread:8637068800 | create_app:app:36 - INFO - Application started successfully:CORSMiddleware +2022-06-18 18:01:36 | MainThread:8637068800 | create_app:app:37 - INFO - Server address http://192.168.0.105:8000 +2022-06-18 18:01:36 | MainThread:8637068800 | create_app:app:38 - INFO - Api doc address http://192.168.0.105:8000/docs +2022-06-18 18:01:36 | MainThread:8637068800 | create_app:app:39 - INFO - Api redoc address http://192.168.0.105:8000/redoc +2022-06-18 18:01:36 | MainThread:8637068800 | create_app:app:15 - INFO - loading application configuration +2022-06-18 18:01:36 | MainThread:8637068800 | create_app:app:16 - INFO - create FastApi app object +2022-06-18 18:01:36 | MainThread:8637068800 | create_app:app:25 - INFO - Adding a New route success +2022-06-18 18:01:36 | MainThread:8637068800 | create_app:app:25 - INFO - Adding a New route success +2022-06-18 18:01:36 | MainThread:8637068800 | create_app:app:26 - INFO - Start registering middleware +2022-06-18 18:01:36 | MainThread:8637068800 | create_app:app:36 - INFO - Application started successfully:CORSMiddleware +2022-06-18 18:01:36 | MainThread:8637068800 | create_app:app:37 - INFO - Server address http://192.168.0.105:8000 +2022-06-18 18:01:36 | MainThread:8637068800 | create_app:app:38 - INFO - Api doc address http://192.168.0.105:8000/docs +2022-06-18 18:01:36 | MainThread:8637068800 | create_app:app:39 - INFO - Api redoc address http://192.168.0.105:8000/redoc +2022-06-18 18:06:25 | MainThread:8629720576 | :__init__:16 - INFO - start the automation service development environment +2022-06-18 18:06:25 | MainThread:8629720576 | :__init__:22 - INFO - loading environment configuration file +2022-06-18 18:06:26 | MainThread:8629720576 | create_app:app:15 - INFO - loading application configuration +2022-06-18 18:06:26 | MainThread:8629720576 | create_app:app:16 - INFO - create FastApi app object +2022-06-18 18:06:26 | MainThread:8629720576 | create_app:app:25 - INFO - Adding a New route success +2022-06-18 18:06:26 | MainThread:8629720576 | create_app:app:25 - INFO - Adding a New route success +2022-06-18 18:06:26 | MainThread:8629720576 | create_app:app:26 - INFO - Start registering middleware +2022-06-18 18:06:26 | MainThread:8629720576 | create_app:app:36 - INFO - Application started successfully:CORSMiddleware +2022-06-18 18:06:26 | MainThread:8629720576 | create_app:app:37 - INFO - Server address http://192.168.0.105:8000 +2022-06-18 18:06:26 | MainThread:8629720576 | create_app:app:38 - INFO - Api doc address http://192.168.0.105:8000/docs +2022-06-18 18:06:26 | MainThread:8629720576 | create_app:app:39 - INFO - Api redoc address http://192.168.0.105:8000/redoc +2022-06-18 18:06:26 | MainThread:8602215936 | :__init__:16 - INFO - start the automation service development environment +2022-06-18 18:06:26 | MainThread:8602215936 | :__init__:22 - INFO - loading environment configuration file +2022-06-18 18:06:27 | MainThread:8602215936 | create_app:app:15 - INFO - loading application configuration +2022-06-18 18:06:27 | MainThread:8602215936 | create_app:app:16 - INFO - create FastApi app object +2022-06-18 18:06:27 | MainThread:8602215936 | create_app:app:25 - INFO - Adding a New route success +2022-06-18 18:06:27 | MainThread:8602215936 | create_app:app:25 - INFO - Adding a New route success +2022-06-18 18:06:27 | MainThread:8602215936 | create_app:app:26 - INFO - Start registering middleware +2022-06-18 18:06:27 | MainThread:8602215936 | create_app:app:36 - INFO - Application started successfully:CORSMiddleware +2022-06-18 18:06:27 | MainThread:8602215936 | create_app:app:37 - INFO - Server address http://192.168.0.105:8000 +2022-06-18 18:06:27 | MainThread:8602215936 | create_app:app:38 - INFO - Api doc address http://192.168.0.105:8000/docs +2022-06-18 18:06:27 | MainThread:8602215936 | create_app:app:39 - INFO - Api redoc address http://192.168.0.105:8000/redoc +2022-06-18 18:06:27 | MainThread:8602215936 | create_app:app:15 - INFO - loading application configuration +2022-06-18 18:06:27 | MainThread:8602215936 | create_app:app:16 - INFO - create FastApi app object +2022-06-18 18:06:27 | MainThread:8602215936 | create_app:app:25 - INFO - Adding a New route success +2022-06-18 18:06:27 | MainThread:8602215936 | create_app:app:25 - INFO - Adding a New route success +2022-06-18 18:06:27 | MainThread:8602215936 | create_app:app:26 - INFO - Start registering middleware +2022-06-18 18:06:27 | MainThread:8602215936 | create_app:app:36 - INFO - Application started successfully:CORSMiddleware +2022-06-18 18:06:27 | MainThread:8602215936 | create_app:app:37 - INFO - Server address http://192.168.0.105:8000 +2022-06-18 18:06:27 | MainThread:8602215936 | create_app:app:38 - INFO - Api doc address http://192.168.0.105:8000/docs +2022-06-18 18:06:27 | MainThread:8602215936 | create_app:app:39 - INFO - Api redoc address http://192.168.0.105:8000/redoc +2022-06-18 18:06:41 | MainThread:8627500544 | :__init__:16 - INFO - start the automation service development environment +2022-06-18 18:06:41 | MainThread:8627500544 | :__init__:22 - INFO - loading environment configuration file +2022-06-18 18:06:42 | MainThread:8627500544 | create_app:app:15 - INFO - loading application configuration +2022-06-18 18:06:42 | MainThread:8627500544 | create_app:app:16 - INFO - create FastApi app object +2022-06-18 18:06:42 | MainThread:8627500544 | create_app:app:25 - INFO - Adding a New route success +2022-06-18 18:06:42 | MainThread:8627500544 | create_app:app:25 - INFO - Adding a New route success +2022-06-18 18:06:42 | MainThread:8627500544 | create_app:app:26 - INFO - Start registering middleware +2022-06-18 18:06:42 | MainThread:8627500544 | create_app:app:36 - INFO - Application started successfully:CORSMiddleware +2022-06-18 18:06:42 | MainThread:8627500544 | create_app:app:37 - INFO - Server address http://192.168.0.105:8000 +2022-06-18 18:06:42 | MainThread:8627500544 | create_app:app:38 - INFO - Api doc address http://192.168.0.105:8000/docs +2022-06-18 18:06:42 | MainThread:8627500544 | create_app:app:39 - INFO - Api redoc address http://192.168.0.105:8000/redoc +2022-06-18 18:06:43 | MainThread:8610543104 | :__init__:16 - INFO - start the automation service development environment +2022-06-18 18:06:43 | MainThread:8610543104 | :__init__:22 - INFO - loading environment configuration file +2022-06-18 18:06:43 | MainThread:8610543104 | create_app:app:15 - INFO - loading application configuration +2022-06-18 18:06:43 | MainThread:8610543104 | create_app:app:16 - INFO - create FastApi app object +2022-06-18 18:06:43 | MainThread:8610543104 | create_app:app:25 - INFO - Adding a New route success +2022-06-18 18:06:43 | MainThread:8610543104 | create_app:app:25 - INFO - Adding a New route success +2022-06-18 18:06:43 | MainThread:8610543104 | create_app:app:26 - INFO - Start registering middleware +2022-06-18 18:06:43 | MainThread:8610543104 | create_app:app:36 - INFO - Application started successfully:CORSMiddleware +2022-06-18 18:06:43 | MainThread:8610543104 | create_app:app:37 - INFO - Server address http://192.168.0.105:8000 +2022-06-18 18:06:43 | MainThread:8610543104 | create_app:app:38 - INFO - Api doc address http://192.168.0.105:8000/docs +2022-06-18 18:06:43 | MainThread:8610543104 | create_app:app:39 - INFO - Api redoc address http://192.168.0.105:8000/redoc +2022-06-18 18:06:43 | MainThread:8610543104 | create_app:app:15 - INFO - loading application configuration +2022-06-18 18:06:43 | MainThread:8610543104 | create_app:app:16 - INFO - create FastApi app object +2022-06-18 18:06:43 | MainThread:8610543104 | create_app:app:25 - INFO - Adding a New route success +2022-06-18 18:06:43 | MainThread:8610543104 | create_app:app:25 - INFO - Adding a New route success +2022-06-18 18:06:43 | MainThread:8610543104 | create_app:app:26 - INFO - Start registering middleware +2022-06-18 18:06:43 | MainThread:8610543104 | create_app:app:36 - INFO - Application started successfully:CORSMiddleware +2022-06-18 18:06:43 | MainThread:8610543104 | create_app:app:37 - INFO - Server address http://192.168.0.105:8000 +2022-06-18 18:06:43 | MainThread:8610543104 | create_app:app:38 - INFO - Api doc address http://192.168.0.105:8000/docs +2022-06-18 18:06:43 | MainThread:8610543104 | create_app:app:39 - INFO - Api redoc address http://192.168.0.105:8000/redoc +2022-06-18 18:09:45 | MainThread:8643950080 | :__init__:16 - INFO - start the automation service development environment +2022-06-18 18:09:45 | MainThread:8643950080 | :__init__:22 - INFO - loading environment configuration file +2022-06-18 18:09:46 | MainThread:8643950080 | create_app:app:15 - INFO - loading application configuration +2022-06-18 18:09:46 | MainThread:8643950080 | create_app:app:16 - INFO - create FastApi app object +2022-06-18 18:09:46 | MainThread:8643950080 | create_app:app:25 - INFO - Adding a New route success +2022-06-18 18:09:46 | MainThread:8643950080 | create_app:app:25 - INFO - Adding a New route success +2022-06-18 18:09:46 | MainThread:8643950080 | create_app:app:26 - INFO - Start registering middleware +2022-06-18 18:09:46 | MainThread:8643950080 | create_app:app:36 - INFO - Application started successfully:CORSMiddleware +2022-06-18 18:09:46 | MainThread:8643950080 | create_app:app:37 - INFO - Server address http://192.168.0.105:8000 +2022-06-18 18:09:46 | MainThread:8643950080 | create_app:app:38 - INFO - Api doc address http://192.168.0.105:8000/docs +2022-06-18 18:09:46 | MainThread:8643950080 | create_app:app:39 - INFO - Api redoc address http://192.168.0.105:8000/redoc +2022-06-18 18:09:46 | MainThread:8593896960 | :__init__:16 - INFO - start the automation service development environment +2022-06-18 18:09:46 | MainThread:8593896960 | :__init__:22 - INFO - loading environment configuration file +2022-06-18 18:09:47 | MainThread:8593896960 | create_app:app:15 - INFO - loading application configuration +2022-06-18 18:09:47 | MainThread:8593896960 | create_app:app:16 - INFO - create FastApi app object +2022-06-18 18:09:47 | MainThread:8593896960 | create_app:app:25 - INFO - Adding a New route success +2022-06-18 18:09:47 | MainThread:8593896960 | create_app:app:25 - INFO - Adding a New route success +2022-06-18 18:09:47 | MainThread:8593896960 | create_app:app:26 - INFO - Start registering middleware +2022-06-18 18:09:47 | MainThread:8593896960 | create_app:app:36 - INFO - Application started successfully:CORSMiddleware +2022-06-18 18:09:47 | MainThread:8593896960 | create_app:app:37 - INFO - Server address http://192.168.0.105:8000 +2022-06-18 18:09:47 | MainThread:8593896960 | create_app:app:38 - INFO - Api doc address http://192.168.0.105:8000/docs +2022-06-18 18:09:47 | MainThread:8593896960 | create_app:app:39 - INFO - Api redoc address http://192.168.0.105:8000/redoc +2022-06-18 18:09:47 | MainThread:8593896960 | create_app:app:15 - INFO - loading application configuration +2022-06-18 18:09:47 | MainThread:8593896960 | create_app:app:16 - INFO - create FastApi app object +2022-06-18 18:09:47 | MainThread:8593896960 | create_app:app:25 - INFO - Adding a New route success +2022-06-18 18:09:47 | MainThread:8593896960 | create_app:app:25 - INFO - Adding a New route success +2022-06-18 18:09:47 | MainThread:8593896960 | create_app:app:26 - INFO - Start registering middleware +2022-06-18 18:09:47 | MainThread:8593896960 | create_app:app:36 - INFO - Application started successfully:CORSMiddleware +2022-06-18 18:09:47 | MainThread:8593896960 | create_app:app:37 - INFO - Server address http://192.168.0.105:8000 +2022-06-18 18:09:47 | MainThread:8593896960 | create_app:app:38 - INFO - Api doc address http://192.168.0.105:8000/docs +2022-06-18 18:09:47 | MainThread:8593896960 | create_app:app:39 - INFO - Api redoc address http://192.168.0.105:8000/redoc diff --git a/repository/user_repository.py b/repository/user_repository.py index 7f6b2d3..99839cd 100644 --- a/repository/user_repository.py +++ b/repository/user_repository.py @@ -16,7 +16,7 @@ from utils.jwt_token import get_md5_pwd def check_user_email(db: Session, user: UserFrom) -> bool: user = db.query(User).filter(or_(User.username == user.username, user.email == user.email)).first() - if user: + if user.username and user.email: return True return False @@ -30,6 +30,6 @@ def register_user(db: Session, user: UserFrom) -> dict: def login_user(db: Session, username, password): password = get_md5_pwd(password) user = db.query(User).filter(User.username == username, User.password == password).first() - if user: + if user.username and user.email: return True, user return False, RegisterUser.LOGIN_USER_ERROR.value