From e9500c893b6f628e2becfef13918ebcf9d19dd62 Mon Sep 17 00:00:00 2001 From: qiangyanwen <508737091@qq.com> Date: Sun, 29 May 2022 11:06:49 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0alembic?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- alembic.ini | 102 ++++++++++++++++++++++++++++++++++++ alembic/README | 1 + alembic/env.py | 78 ++++++++++++++++++++++++++++ alembic/script.py.mako | 24 +++++++++ app.py | 2 - config/database.py | 20 ++++++++ logs/automation_info.log | 108 +++++++++++++++++++++++++++++++++++++++ models/__init__.py | 8 +++ models/model.py | 27 ++++++++++ 9 files changed, 368 insertions(+), 2 deletions(-) create mode 100644 alembic.ini create mode 100644 alembic/README create mode 100644 alembic/env.py create mode 100644 alembic/script.py.mako create mode 100644 config/database.py create mode 100644 models/__init__.py create mode 100644 models/model.py diff --git a/alembic.ini b/alembic.ini new file mode 100644 index 0000000..ff732de --- /dev/null +++ b/alembic.ini @@ -0,0 +1,102 @@ +# A generic, single database configuration. + +[alembic] +# path to migration scripts +script_location = alembic + +# template used to generate migration files +# file_template = %%(rev)s_%%(slug)s + +# sys.path path, will be prepended to sys.path if present. +# defaults to the current working directory. +prepend_sys_path = . + +# timezone to use when rendering the date within the migration file +# as well as the filename. +# If specified, requires the python-dateutil library that can be +# installed by adding `alembic[tz]` to the pip requirements +# string value is passed to dateutil.tz.gettz() +# leave blank for localtime +# timezone = + +# max length of characters to apply to the +# "slug" field +# truncate_slug_length = 40 + +# set to 'true' to run the environment during +# the 'revision' command, regardless of autogenerate +# revision_environment = false + +# set to 'true' to allow .pyc and .pyo files without +# a source .py file to be detected as revisions in the +# versions/ directory +# sourceless = false + +# version location specification; This defaults +# to alembic/versions. When using multiple version +# directories, initial revisions must be specified with --version-path. +# The path separator used here should be the separator specified by "version_path_separator" below. +# version_locations = %(here)s/bar:%(here)s/bat:alembic/versions + +# version path separator; As mentioned above, this is the character used to split +# version_locations. The default within new alembic.ini files is "os", which uses os.pathsep. +# If this key is omitted entirely, it falls back to the legacy behavior of splitting on spaces and/or commas. +# Valid values for version_path_separator are: +# +# version_path_separator = : +# version_path_separator = ; +# version_path_separator = space +version_path_separator = os # Use os.pathsep. Default configuration used for new projects. + +# the output encoding used when revision files +# are written from script.py.mako +# output_encoding = utf-8 + +sqlalchemy.url = driver://user:pass@localhost/dbname + + +[post_write_hooks] +# post_write_hooks defines scripts or Python functions that are run +# on newly generated revision scripts. See the documentation for further +# detail and examples + +# format using "black" - use the console_scripts runner, against the "black" entrypoint +# hooks = black +# black.type = console_scripts +# black.entrypoint = black +# black.options = -l 79 REVISION_SCRIPT_FILENAME + +# Logging configuration +[loggers] +keys = root,sqlalchemy,alembic + +[handlers] +keys = console + +[formatters] +keys = generic + +[logger_root] +level = WARN +handlers = console +qualname = + +[logger_sqlalchemy] +level = WARN +handlers = +qualname = sqlalchemy.engine + +[logger_alembic] +level = INFO +handlers = +qualname = alembic + +[handler_console] +class = StreamHandler +args = (sys.stderr,) +level = NOTSET +formatter = generic + +[formatter_generic] +format = %(levelname)-5.5s [%(name)s] %(message)s +datefmt = %H:%M:%S diff --git a/alembic/README b/alembic/README new file mode 100644 index 0000000..98e4f9c --- /dev/null +++ b/alembic/README @@ -0,0 +1 @@ +Generic single-database configuration. \ No newline at end of file diff --git a/alembic/env.py b/alembic/env.py new file mode 100644 index 0000000..edeff1d --- /dev/null +++ b/alembic/env.py @@ -0,0 +1,78 @@ +from logging.config import fileConfig + +from sqlalchemy import engine_from_config +from sqlalchemy import pool + +from alembic import context + +# this is the Alembic Config object, which provides +# access to the values within the .ini file in use. +config = context.config + +# Interpret the config file for Python logging. +# This line sets up loggers basically. +if config.config_file_name is not None: + fileConfig(config.config_file_name) + +# add your model's MetaData object here +# for 'autogenerate' support +# from myapp import mymodel +# target_metadata = mymodel.Base.metadata +target_metadata = None + +# other values from the config, defined by the needs of env.py, +# can be acquired: +# my_important_option = config.get_main_option("my_important_option") +# ... etc. + + +def run_migrations_offline(): + """Run migrations in 'offline' mode. + + This configures the context with just a URL + and not an Engine, though an Engine is acceptable + here as well. By skipping the Engine creation + we don't even need a DBAPI to be available. + + Calls to context.execute() here emit the given string to the + script output. + + """ + url = config.get_main_option("sqlalchemy.url") + context.configure( + url=url, + target_metadata=target_metadata, + literal_binds=True, + dialect_opts={"paramstyle": "named"}, + ) + + with context.begin_transaction(): + context.run_migrations() + + +def run_migrations_online(): + """Run migrations in 'online' mode. + + In this scenario we need to create an Engine + and associate a connection with the context. + + """ + connectable = engine_from_config( + config.get_section(config.config_ini_section), + prefix="sqlalchemy.", + poolclass=pool.NullPool, + ) + + with connectable.connect() as connection: + context.configure( + connection=connection, target_metadata=target_metadata + ) + + with context.begin_transaction(): + context.run_migrations() + + +if context.is_offline_mode(): + run_migrations_offline() +else: + run_migrations_online() diff --git a/alembic/script.py.mako b/alembic/script.py.mako new file mode 100644 index 0000000..2c01563 --- /dev/null +++ b/alembic/script.py.mako @@ -0,0 +1,24 @@ +"""${message} + +Revision ID: ${up_revision} +Revises: ${down_revision | comma,n} +Create Date: ${create_date} + +""" +from alembic import op +import sqlalchemy as sa +${imports if imports else ""} + +# revision identifiers, used by Alembic. +revision = ${repr(up_revision)} +down_revision = ${repr(down_revision)} +branch_labels = ${repr(branch_labels)} +depends_on = ${repr(depends_on)} + + +def upgrade(): + ${upgrades if upgrades else "pass"} + + +def downgrade(): + ${downgrades if downgrades else "pass"} diff --git a/app.py b/app.py index 2601135..01323d6 100644 --- a/app.py +++ b/app.py @@ -5,9 +5,7 @@ # @File :app.py from fastapi import FastAPI from config.log import logger - from router import routers - from config import settings from utils.system import host from fastapi.middleware.cors import CORSMiddleware diff --git a/config/database.py b/config/database.py new file mode 100644 index 0000000..5b0b5ba --- /dev/null +++ b/config/database.py @@ -0,0 +1,20 @@ +# _*_ coding: utf-8 _*_ +# @Time :2022/5/29 09:41 +# @Email :508737091@qq.com +# @Author :qiangyanwen +# @File :database.py +from sqlalchemy import create_engine +from sqlalchemy.orm import sessionmaker +from sqlalchemy.ext.declarative import declarative_base + +from config import settings +from entity.setting_entity import MysqlModel + +MYSQL = MysqlModel.copy(settings.DATABASE.Mysql) +SQLALCHEMY_DATABASE_URL = f"mysql+pymysql://{MYSQL.USERNAME}:{MYSQL.PASSWORD}@{MYSQL.HOST}:{MYSQL.PORT}/{MYSQL.DATABASE}?charset=utf8mb4" +engine = create_engine(SQLALCHEMY_DATABASE_URL, pool_pre_ping=True, pool_recycle=3600, pool_size=200, echo=True) +SessionLocal = sessionmaker(bind=engine) +DatabaseModel = declarative_base() +from models import Databases +for DatabaseModel in Databases: + DatabaseModel.metadata.create_all(engine) diff --git a/logs/automation_info.log b/logs/automation_info.log index 382a2e4..f4d3737 100644 --- a/logs/automation_info.log +++ b/logs/automation_info.log @@ -192,3 +192,111 @@ 2022-05-29 09:35:02 | MainThread:8675157504 | create_app:app:39 - INFO - Server address http://192.168.1.107:8000 2022-05-29 09:35:02 | MainThread:8675157504 | create_app:app:40 - INFO - Api doc address http://192.168.1.107:8000/docs 2022-05-29 09:35:02 | MainThread:8675157504 | create_app:app:41 - INFO - Api redoc address http://192.168.1.107:8000/redoc +2022-05-29 09:39:18 | MainThread:8640103936 | :__init__:16 - INFO - start the automation service development environment +2022-05-29 09:39:18 | MainThread:8640103936 | :__init__:22 - INFO - loading environment configuration file +2022-05-29 09:39:18 | MainThread:8640103936 | create_app:app:15 - INFO - loading application configuration +2022-05-29 09:39:18 | MainThread:8640103936 | create_app:app:16 - INFO - create FastApi app object +2022-05-29 09:39:18 | MainThread:8640103936 | create_app:app:25 - INFO - Adding a New route success +2022-05-29 09:39:18 | MainThread:8640103936 | create_app:app:26 - INFO - Start registering middleware +2022-05-29 09:39:18 | MainThread:8640103936 | create_app:app:36 - INFO - Application started successfully:CORSMiddleware +2022-05-29 09:39:18 | MainThread:8640103936 | create_app:app:37 - INFO - Server address http://192.168.1.107:8000 +2022-05-29 09:39:18 | MainThread:8640103936 | create_app:app:38 - INFO - Api doc address http://192.168.1.107:8000/docs +2022-05-29 09:39:18 | MainThread:8640103936 | create_app:app:39 - INFO - Api redoc address http://192.168.1.107:8000/redoc +2022-05-29 09:39:18 | MainThread:8640103936 | create_app:app:15 - INFO - loading application configuration +2022-05-29 09:39:18 | MainThread:8640103936 | create_app:app:16 - INFO - create FastApi app object +2022-05-29 09:39:18 | MainThread:8640103936 | create_app:app:25 - INFO - Adding a New route success +2022-05-29 09:39:18 | MainThread:8640103936 | create_app:app:26 - INFO - Start registering middleware +2022-05-29 09:39:18 | MainThread:8640103936 | create_app:app:36 - INFO - Application started successfully:CORSMiddleware +2022-05-29 09:39:18 | MainThread:8640103936 | create_app:app:37 - INFO - Server address http://192.168.1.107:8000 +2022-05-29 09:39:18 | MainThread:8640103936 | create_app:app:38 - INFO - Api doc address http://192.168.1.107:8000/docs +2022-05-29 09:39:18 | MainThread:8640103936 | create_app:app:39 - INFO - Api redoc address http://192.168.1.107:8000/redoc +2022-05-29 09:41:06 | MainThread:8598021632 | :__init__:16 - INFO - start the automation service development environment +2022-05-29 09:41:06 | MainThread:8598021632 | :__init__:22 - INFO - loading environment configuration file +2022-05-29 09:41:06 | MainThread:8598021632 | create_app:app:15 - INFO - loading application configuration +2022-05-29 09:41:06 | MainThread:8598021632 | create_app:app:16 - INFO - create FastApi app object +2022-05-29 09:41:06 | MainThread:8598021632 | create_app:app:25 - INFO - Adding a New route success +2022-05-29 09:41:06 | MainThread:8598021632 | create_app:app:26 - INFO - Start registering middleware +2022-05-29 09:41:06 | MainThread:8598021632 | create_app:app:36 - INFO - Application started successfully:CORSMiddleware +2022-05-29 09:41:06 | MainThread:8598021632 | create_app:app:37 - INFO - Server address http://192.168.1.107:8000 +2022-05-29 09:41:06 | MainThread:8598021632 | create_app:app:38 - INFO - Api doc address http://192.168.1.107:8000/docs +2022-05-29 09:41:06 | MainThread:8598021632 | create_app:app:39 - INFO - Api redoc address http://192.168.1.107:8000/redoc +2022-05-29 09:41:06 | MainThread:8598021632 | create_app:app:15 - INFO - loading application configuration +2022-05-29 09:41:06 | MainThread:8598021632 | create_app:app:16 - INFO - create FastApi app object +2022-05-29 09:41:06 | MainThread:8598021632 | create_app:app:25 - INFO - Adding a New route success +2022-05-29 09:41:06 | MainThread:8598021632 | create_app:app:26 - INFO - Start registering middleware +2022-05-29 09:41:06 | MainThread:8598021632 | create_app:app:36 - INFO - Application started successfully:CORSMiddleware +2022-05-29 09:41:06 | MainThread:8598021632 | create_app:app:37 - INFO - Server address http://192.168.1.107:8000 +2022-05-29 09:41:06 | MainThread:8598021632 | create_app:app:38 - INFO - Api doc address http://192.168.1.107:8000/docs +2022-05-29 09:41:06 | MainThread:8598021632 | create_app:app:39 - INFO - Api redoc address http://192.168.1.107:8000/redoc +2022-05-29 09:41:45 | MainThread:8602482176 | :__init__:16 - INFO - start the automation service development environment +2022-05-29 09:41:45 | MainThread:8602482176 | :__init__:22 - INFO - loading environment configuration file +2022-05-29 09:41:45 | MainThread:8602482176 | create_app:app:15 - INFO - loading application configuration +2022-05-29 09:41:45 | MainThread:8602482176 | create_app:app:16 - INFO - create FastApi app object +2022-05-29 09:41:45 | MainThread:8602482176 | create_app:app:25 - INFO - Adding a New route success +2022-05-29 09:41:45 | MainThread:8602482176 | create_app:app:26 - INFO - Start registering middleware +2022-05-29 09:41:45 | MainThread:8602482176 | create_app:app:36 - INFO - Application started successfully:CORSMiddleware +2022-05-29 09:41:45 | MainThread:8602482176 | create_app:app:37 - INFO - Server address http://192.168.1.107:8000 +2022-05-29 09:41:45 | MainThread:8602482176 | create_app:app:38 - INFO - Api doc address http://192.168.1.107:8000/docs +2022-05-29 09:41:45 | MainThread:8602482176 | create_app:app:39 - INFO - Api redoc address http://192.168.1.107:8000/redoc +2022-05-29 09:41:45 | MainThread:8602482176 | create_app:app:15 - INFO - loading application configuration +2022-05-29 09:41:45 | MainThread:8602482176 | create_app:app:16 - INFO - create FastApi app object +2022-05-29 09:41:45 | MainThread:8602482176 | create_app:app:25 - INFO - Adding a New route success +2022-05-29 09:41:45 | MainThread:8602482176 | create_app:app:26 - INFO - Start registering middleware +2022-05-29 09:41:45 | MainThread:8602482176 | create_app:app:36 - INFO - Application started successfully:CORSMiddleware +2022-05-29 09:41:45 | MainThread:8602482176 | create_app:app:37 - INFO - Server address http://192.168.1.107:8000 +2022-05-29 09:41:45 | MainThread:8602482176 | create_app:app:38 - INFO - Api doc address http://192.168.1.107:8000/docs +2022-05-29 09:41:45 | MainThread:8602482176 | create_app:app:39 - INFO - Api redoc address http://192.168.1.107:8000/redoc +2022-05-29 09:48:25 | MainThread:8595789312 | :__init__:16 - INFO - start the automation service development environment +2022-05-29 09:48:25 | MainThread:8595789312 | :__init__:22 - INFO - loading environment configuration file +2022-05-29 09:48:25 | MainThread:8595789312 | create_app:app:15 - INFO - loading application configuration +2022-05-29 09:48:25 | MainThread:8595789312 | create_app:app:16 - INFO - create FastApi app object +2022-05-29 09:48:25 | MainThread:8595789312 | create_app:app:25 - INFO - Adding a New route success +2022-05-29 09:48:25 | MainThread:8595789312 | create_app:app:26 - INFO - Start registering middleware +2022-05-29 09:48:25 | MainThread:8595789312 | create_app:app:36 - INFO - Application started successfully:CORSMiddleware +2022-05-29 09:48:25 | MainThread:8595789312 | create_app:app:37 - INFO - Server address http://192.168.1.107:8000 +2022-05-29 09:48:25 | MainThread:8595789312 | create_app:app:38 - INFO - Api doc address http://192.168.1.107:8000/docs +2022-05-29 09:48:25 | MainThread:8595789312 | create_app:app:39 - INFO - Api redoc address http://192.168.1.107:8000/redoc +2022-05-29 09:48:25 | MainThread:8595789312 | create_app:app:15 - INFO - loading application configuration +2022-05-29 09:48:25 | MainThread:8595789312 | create_app:app:16 - INFO - create FastApi app object +2022-05-29 09:48:25 | MainThread:8595789312 | create_app:app:25 - INFO - Adding a New route success +2022-05-29 09:48:25 | MainThread:8595789312 | create_app:app:26 - INFO - Start registering middleware +2022-05-29 09:48:25 | MainThread:8595789312 | create_app:app:36 - INFO - Application started successfully:CORSMiddleware +2022-05-29 09:48:25 | MainThread:8595789312 | create_app:app:37 - INFO - Server address http://192.168.1.107:8000 +2022-05-29 09:48:25 | MainThread:8595789312 | create_app:app:38 - INFO - Api doc address http://192.168.1.107:8000/docs +2022-05-29 09:48:25 | MainThread:8595789312 | create_app:app:39 - INFO - Api redoc address http://192.168.1.107:8000/redoc +2022-05-29 09:48:40 | MainThread:8669562368 | :__init__:16 - INFO - start the automation service development environment +2022-05-29 09:48:40 | MainThread:8669562368 | :__init__:22 - INFO - loading environment configuration file +2022-05-29 09:48:40 | MainThread:8669562368 | create_app:app:15 - INFO - loading application configuration +2022-05-29 09:48:40 | MainThread:8669562368 | create_app:app:16 - INFO - create FastApi app object +2022-05-29 09:48:40 | MainThread:8669562368 | create_app:app:25 - INFO - Adding a New route success +2022-05-29 09:48:40 | MainThread:8669562368 | create_app:app:26 - INFO - Start registering middleware +2022-05-29 09:48:40 | MainThread:8669562368 | create_app:app:36 - INFO - Application started successfully:CORSMiddleware +2022-05-29 09:48:40 | MainThread:8669562368 | create_app:app:37 - INFO - Server address http://192.168.1.107:8000 +2022-05-29 09:48:40 | MainThread:8669562368 | create_app:app:38 - INFO - Api doc address http://192.168.1.107:8000/docs +2022-05-29 09:48:40 | MainThread:8669562368 | create_app:app:39 - INFO - Api redoc address http://192.168.1.107:8000/redoc +2022-05-29 09:48:40 | MainThread:8669562368 | create_app:app:15 - INFO - loading application configuration +2022-05-29 09:48:40 | MainThread:8669562368 | create_app:app:16 - INFO - create FastApi app object +2022-05-29 09:48:40 | MainThread:8669562368 | create_app:app:25 - INFO - Adding a New route success +2022-05-29 09:48:40 | MainThread:8669562368 | create_app:app:26 - INFO - Start registering middleware +2022-05-29 09:48:40 | MainThread:8669562368 | create_app:app:36 - INFO - Application started successfully:CORSMiddleware +2022-05-29 09:48:40 | MainThread:8669562368 | create_app:app:37 - INFO - Server address http://192.168.1.107:8000 +2022-05-29 09:48:40 | MainThread:8669562368 | create_app:app:38 - INFO - Api doc address http://192.168.1.107:8000/docs +2022-05-29 09:48:40 | MainThread:8669562368 | create_app:app:39 - INFO - Api redoc address http://192.168.1.107:8000/redoc +2022-05-29 09:52:07 | MainThread:8661964288 | :__init__:16 - INFO - start the automation service development environment +2022-05-29 09:52:07 | MainThread:8661964288 | :__init__:22 - INFO - loading environment configuration file +2022-05-29 09:52:07 | MainThread:8661964288 | create_app:app:15 - INFO - loading application configuration +2022-05-29 09:52:07 | MainThread:8661964288 | create_app:app:16 - INFO - create FastApi app object +2022-05-29 09:52:07 | MainThread:8661964288 | create_app:app:25 - INFO - Adding a New route success +2022-05-29 09:52:07 | MainThread:8661964288 | create_app:app:26 - INFO - Start registering middleware +2022-05-29 09:52:07 | MainThread:8661964288 | create_app:app:36 - INFO - Application started successfully:CORSMiddleware +2022-05-29 09:52:07 | MainThread:8661964288 | create_app:app:37 - INFO - Server address http://192.168.1.107:8000 +2022-05-29 09:52:07 | MainThread:8661964288 | create_app:app:38 - INFO - Api doc address http://192.168.1.107:8000/docs +2022-05-29 09:52:07 | MainThread:8661964288 | create_app:app:39 - INFO - Api redoc address http://192.168.1.107:8000/redoc +2022-05-29 09:52:07 | MainThread:8661964288 | create_app:app:15 - INFO - loading application configuration +2022-05-29 09:52:07 | MainThread:8661964288 | create_app:app:16 - INFO - create FastApi app object +2022-05-29 09:52:07 | MainThread:8661964288 | create_app:app:25 - INFO - Adding a New route success +2022-05-29 09:52:07 | MainThread:8661964288 | create_app:app:26 - INFO - Start registering middleware +2022-05-29 09:52:07 | MainThread:8661964288 | create_app:app:36 - INFO - Application started successfully:CORSMiddleware +2022-05-29 09:52:07 | MainThread:8661964288 | create_app:app:37 - INFO - Server address http://192.168.1.107:8000 +2022-05-29 09:52:07 | MainThread:8661964288 | create_app:app:38 - INFO - Api doc address http://192.168.1.107:8000/docs +2022-05-29 09:52:07 | MainThread:8661964288 | create_app:app:39 - INFO - Api redoc address http://192.168.1.107:8000/redoc diff --git a/models/__init__.py b/models/__init__.py new file mode 100644 index 0000000..2293541 --- /dev/null +++ b/models/__init__.py @@ -0,0 +1,8 @@ +# _*_ coding: utf-8 _*_ +# @Time :2022/5/29 09:39 +# @Email :508737091@qq.com +# @Author :qiangyanwen +# @File :__init__.py.py +from .model import DatabaseModel as user + +Databases = [user] diff --git a/models/model.py b/models/model.py new file mode 100644 index 0000000..5458923 --- /dev/null +++ b/models/model.py @@ -0,0 +1,27 @@ +# _*_ coding: utf-8 _*_ +# @Time :2022/5/29 09:40 +# @Email :508737091@qq.com +# @Author :qiangyanwen +# @File :model.py +from datetime import datetime +from sqlalchemy import Column, INT, String, DATETIME +from config.database import DatabaseModel + + +class User(DatabaseModel): + """ + 用户表 + """ + __tablename__ = "user" + id = Column(INT, primary_key=True) + username = Column(String(16), unique=True, index=True, comment="用户名") + password = Column(String(64), unique=False, comment="密码") + email = Column(String(64), unique=True, nullable=False, comment="邮箱") + created_time = Column(DATETIME) + deleted_time = Column(DATETIME) + __table_args__ = ({'comment': '用户表'}) + def __init__(self, username, password, email): + self.username = username + self.password = password + self.email = email + self.created_time = datetime.now().strftime("%Y-%m-%d %H:%M:%S")