feat: 新增环境变量配置，支持使用命令启动对应的应用环境

ruoyi-fastapi-backend/config/database.py

@@ -4,8 +4,8 @@ from sqlalchemy.orm import sessionmaker
 from urllib.parse import quote_plus
 from config.env import DataBaseConfig
 
-SQLALCHEMY_DATABASE_URL = f"mysql+pymysql://{DataBaseConfig.USERNAME}:{quote_plus(DataBaseConfig.PASSWORD)}@" \
-                          f"{DataBaseConfig.HOST}:{DataBaseConfig.PORT}/{DataBaseConfig.DB}"
+SQLALCHEMY_DATABASE_URL = f"mysql+pymysql://{DataBaseConfig.db_username}:{quote_plus(DataBaseConfig.db_password)}@" \
+                          f"{DataBaseConfig.db_host}:{DataBaseConfig.db_port}/{DataBaseConfig.db_database}"
 
 engine = create_engine(
     SQLALCHEMY_DATABASE_URL, echo=True

ruoyi-fastapi-backend/config/env.py

@@ -1,39 +1,57 @@
 import os
+import sys
+import argparse
+from pydantic_settings import BaseSettings
+from functools import lru_cache
+from dotenv import load_dotenv
 
 
-class JwtConfig:
+class AppSettings(BaseSettings):
+    """
+    应用配置
+    """
+    app_env: str = 'dev'
+    app_name: str = 'RuoYi-FasAPI'
+    app_root_path: str = '/dev-api'
+    app_host: str = '0.0.0.0'
+    app_port: int = 9099
+    app_version: str = '1.0.0'
+    app_reload: bool = True
+
+
+class JwtSettings(BaseSettings):
     """
     Jwt配置
     """
-    SECRET_KEY = "b01c66dc2c58dc6a0aabfe2144256be36226de378bf87f72c0c795dda67f4d55"
-    ALGORITHM = "HS256"
-    ACCESS_TOKEN_EXPIRE_MINUTES = 1440
-    REDIS_TOKEN_EXPIRE_MINUTES = 30
+    jwt_secret_key: str = 'b01c66dc2c58dc6a0aabfe2144256be36226de378bf87f72c0c795dda67f4d55'
+    jwt_algorithm: str = 'HS256'
+    jwt_expire_minutes: int = 1440
+    jwt_redis_expire_minutes: int = 30
 
 
-class DataBaseConfig:
+class DataBaseSettings(BaseSettings):
     """
     数据库配置
     """
-    HOST = "127.0.0.1"
-    PORT = 3306
-    USERNAME = 'root'
-    PASSWORD = 'mysqlroot'
-    DB = 'ruoyi-fastapi'
+    db_host: str = '127.0.0.1'
+    db_port: int = 3306
+    db_username: str = 'root'
+    db_password: str = 'mysqlroot'
+    db_database: str = 'ruoyi-fastapi'
 
 
-class RedisConfig:
+class RedisSettings(BaseSettings):
     """
     Redis配置
     """
-    HOST = "127.0.0.1"
-    PORT = 6379
-    USERNAME = ''
-    PASSWORD = ''
-    DB = 2
+    redis_host: str = '127.0.0.1'
+    redis_port: int = 6379
+    redis_username: str = ''
+    redis_password: str = ''
+    redis_database: int = 2
 
 
-class UploadConfig:
+class UploadSettings:
     """
     上传配置
     """
@@ -80,3 +98,92 @@ class RedisInitKeyConfig:
     ACCOUNT_LOCK = {'key': 'account_lock', 'remark': '用户锁定'}
     PASSWORD_ERROR_COUNT = {'key': 'password_error_count', 'remark': '密码错误次数'}
     SMS_CODE = {'key': 'sms_code', 'remark': '短信验证码'}
+
+
+class GetConfig:
+    """
+    获取配置
+    """
+
+    def __init__(self):
+        self.parse_cli_args()
+
+    @lru_cache()
+    def get_app_config(self):
+        """
+        获取应用配置
+        """
+        # 实例化应用配置模型
+        return AppSettings()
+
+    @lru_cache()
+    def get_jwt_config(self):
+        """
+        获取Jwt配置
+        """
+        # 实例化Jwt配置模型
+        return JwtSettings()
+
+    @lru_cache()
+    def get_database_config(self):
+        """
+        获取数据库配置
+        """
+        # 实例化数据库配置模型
+        return DataBaseSettings()
+
+    @lru_cache()
+    def get_redis_config(self):
+        """
+        获取Redis配置
+        """
+        # 实例化Redis配置模型
+        return RedisSettings()
+
+    @lru_cache()
+    def get_upload_config(self):
+        """
+        获取数据库配置
+        """
+        # 实例上传配置
+        return UploadSettings()
+
+    @staticmethod
+    def parse_cli_args():
+        """
+        解析命令行参数
+        """
+        if 'uvicorn' in sys.argv[0]:
+            # 使用uvicorn启动时，命令行参数需要按照uvicorn的文档进行配置，无法自定义参数
+            pass
+        else:
+            # 使用argparse定义命令行参数
+            parser = argparse.ArgumentParser(description='命令行参数')
+            parser.add_argument('--env', type=str, default='', help='运行环境')
+            # 解析命令行参数
+            args = parser.parse_args()
+            # 设置环境变量
+            os.environ['APP_ENV'] = args.env
+        # 读取运行环境
+        run_env = os.environ.get('APP_ENV', '')
+        # 运行环境未指定时默认加载.env.dev
+        env_file = '.env.dev'
+        # 运行环境不为空时按命令行参数加载对应.env文件
+        if run_env != '':
+            env_file = f'.env.{run_env}'
+        # 加载配置
+        load_dotenv(env_file)
+
+
+# 实例化获取配置类
+get_config = GetConfig()
+# 应用配置
+AppConfig = get_config.get_app_config()
+# Jwt配置
+JwtConfig = get_config.get_jwt_config()
+# 数据库配置
+DataBaseConfig = get_config.get_database_config()
+# Redis配置
+RedisConfig = get_config.get_redis_config()
+# 上传配置
+UploadConfig = get_config.get_upload_config()

ruoyi-fastapi-backend/config/get_redis.py

@@ -19,11 +19,11 @@ class RedisUtil:
         """
         logger.info("开始连接redis...")
         redis = await aioredis.from_url(
-            url=f"redis://{RedisConfig.HOST}",
-            port=RedisConfig.PORT,
-            username=RedisConfig.USERNAME,
-            password=RedisConfig.PASSWORD,
-            db=RedisConfig.DB,
+            url=f"redis://{RedisConfig.redis_host}",
+            port=RedisConfig.redis_port,
+            username=RedisConfig.redis_username,
+            password=RedisConfig.redis_password,
+            db=RedisConfig.redis_database,
             encoding="utf-8",
             decode_responses=True
         )

ruoyi-fastapi-backend/config/get_scheduler.py

@@ -70,11 +70,11 @@ job_stores = {
     'sqlalchemy': SQLAlchemyJobStore(url=SQLALCHEMY_DATABASE_URL, engine=engine),
     'redis': RedisJobStore(
         **dict(
-            host=RedisConfig.HOST,
-            port=RedisConfig.PORT,
-            username=RedisConfig.USERNAME,
-            password=RedisConfig.PASSWORD,
-            db=RedisConfig.DB
+            host=RedisConfig.redis_host,
+            port=RedisConfig.redis_port,
+            username=RedisConfig.redis_username,
+            password=RedisConfig.redis_password,
+            db=RedisConfig.redis_database
         )
     )
 }