feat: migrate configuration to .env environment variables
This commit implements a complete migration from JSON-based configuration to .env environment variables, providing better security and flexibility. Key Changes: - Add python-dotenv dependency for environment variable support - Create config/env_loader.py with type conversion utilities - Add from_env() class methods to all config dataclasses - Update ConfigLoader to prioritize environment variables - Add save_to_env() method for .env file management - Implement database connection factory pattern - Add base DAO and connection classes for better abstraction - Support both SQL Server and MySQL with unified interface - Create migration script (scripts/migrate_to_env.py) - Update GUI to read/write .env files - Add comprehensive migration documentation New Files: - config/env_loader.py - Environment variable loader - db/base_connection.py - Base database connection interface - db/base_dao.py - Base DAO with common utilities - db/connection_factory.py - Factory for creating connections - db/mysql_connection.py - MySQL-specific connection - db/sqlserver_connection.py - SQL Server-specific connection - db/table_name_converter.py - SQL dialect converter - scripts/migrate_to_env.py - Configuration migration tool - docs/ENV_MIGRATION.md - Complete migration guide - .env.example - Environment variable template Testing: - Verified MySQL connection (8.0.44) - Tested all DAO operations - Confirmed 150 tables accessible - Validated configuration loading Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
This commit is contained in:
Misaka
@@ -2,10 +2,12 @@
|
||||
BIPUsers DAO - Data access object for user authentication and management
|
||||
"""
|
||||
from typing import Optional, Dict, Any, List
|
||||
from db.base_dao import BaseDAO
|
||||
from db.connection import get_connection
|
||||
from config.schema import DatabaseType
|
||||
|
||||
|
||||
class BIPUsersDAO:
|
||||
class BIPUsersDAO(BaseDAO):
|
||||
"""Data access object for BIPUsers table"""
|
||||
|
||||
def authenticate(self, username: str, password: str) -> Optional[Dict[str, Any]]:
|
||||
@@ -20,11 +22,23 @@ class BIPUsersDAO:
|
||||
Dict with user info if authentication successful, None otherwise
|
||||
Returns: {id, username, user_type}
|
||||
"""
|
||||
sql = """
|
||||
SELECT [ID], [UserName], [UserType]
|
||||
FROM [dbo].[BIPUsers]
|
||||
WHERE [UserName] = ? AND [Password] = ?
|
||||
"""
|
||||
table_name = self._convert_sql('[dbo].[BIPUsers]')
|
||||
placeholder = self._get_placeholder()
|
||||
|
||||
# 根据数据库类型选择列名格式
|
||||
if self._db_type == DatabaseType.MYSQL:
|
||||
sql = f"""
|
||||
SELECT ID, UserName, UserType
|
||||
FROM {table_name}
|
||||
WHERE UserName = {placeholder} AND Password = {placeholder}
|
||||
"""
|
||||
else:
|
||||
sql = f"""
|
||||
SELECT [ID], [UserName], [UserType]
|
||||
FROM {table_name}
|
||||
WHERE [UserName] = {placeholder} AND [Password] = {placeholder}
|
||||
"""
|
||||
|
||||
with get_connection() as db:
|
||||
results = db.execute_query(sql, (username, password))
|
||||
if results:
|
||||
@@ -42,11 +56,22 @@ class BIPUsersDAO:
|
||||
Returns:
|
||||
List of user dictionaries: [{id, username, user_type, create_time}]
|
||||
"""
|
||||
sql = """
|
||||
SELECT [ID], [UserName], [UserType], [CreateTime]
|
||||
FROM [dbo].[BIPUsers]
|
||||
ORDER BY [UserName]
|
||||
"""
|
||||
table_name = self._convert_sql('[dbo].[BIPUsers]')
|
||||
|
||||
# 根据数据库类型选择列名格式
|
||||
if self._db_type == DatabaseType.MYSQL:
|
||||
sql = f"""
|
||||
SELECT ID, UserName, UserType, CreateTime
|
||||
FROM {table_name}
|
||||
ORDER BY UserName
|
||||
"""
|
||||
else:
|
||||
sql = f"""
|
||||
SELECT [ID], [UserName], [UserType], [CreateTime]
|
||||
FROM {table_name}
|
||||
ORDER BY [UserName]
|
||||
"""
|
||||
|
||||
with get_connection() as db:
|
||||
results = db.execute_query(sql)
|
||||
return [
|
||||
@@ -71,10 +96,21 @@ class BIPUsersDAO:
|
||||
Returns:
|
||||
True if successful, False otherwise
|
||||
"""
|
||||
sql = """
|
||||
INSERT INTO [dbo].[BIPUsers] ([UserName], [Password], [UserType])
|
||||
VALUES (?, ?, ?)
|
||||
"""
|
||||
table_name = self._convert_sql('[dbo].[BIPUsers]')
|
||||
placeholder = self._get_placeholder()
|
||||
|
||||
# 根据数据库类型选择列名格式
|
||||
if self._db_type == DatabaseType.MYSQL:
|
||||
sql = f"""
|
||||
INSERT INTO {table_name} (UserName, Password, UserType)
|
||||
VALUES ({placeholder}, {placeholder}, {placeholder})
|
||||
"""
|
||||
else:
|
||||
sql = f"""
|
||||
INSERT INTO {table_name} ([UserName], [Password], [UserType])
|
||||
VALUES ({placeholder}, {placeholder}, {placeholder})
|
||||
"""
|
||||
|
||||
try:
|
||||
with get_connection() as db:
|
||||
db.execute_update(sql, (username, password, user_type))
|
||||
@@ -94,11 +130,23 @@ class BIPUsersDAO:
|
||||
Returns:
|
||||
True if successful, False otherwise
|
||||
"""
|
||||
sql = """
|
||||
UPDATE [dbo].[BIPUsers]
|
||||
SET [UserType] = ?
|
||||
WHERE [UserName] = ?
|
||||
"""
|
||||
table_name = self._convert_sql('[dbo].[BIPUsers]')
|
||||
placeholder = self._get_placeholder()
|
||||
|
||||
# 根据数据库类型选择列名格式
|
||||
if self._db_type == DatabaseType.MYSQL:
|
||||
sql = f"""
|
||||
UPDATE {table_name}
|
||||
SET UserType = {placeholder}
|
||||
WHERE UserName = {placeholder}
|
||||
"""
|
||||
else:
|
||||
sql = f"""
|
||||
UPDATE {table_name}
|
||||
SET [UserType] = {placeholder}
|
||||
WHERE [UserName] = {placeholder}
|
||||
"""
|
||||
|
||||
try:
|
||||
with get_connection() as db:
|
||||
db.execute_update(sql, (user_type, username))
|
||||
@@ -118,11 +166,23 @@ class BIPUsersDAO:
|
||||
Returns:
|
||||
True if successful, False otherwise
|
||||
"""
|
||||
sql = """
|
||||
UPDATE [dbo].[BIPUsers]
|
||||
SET [Password] = ?
|
||||
WHERE [UserName] = ?
|
||||
"""
|
||||
table_name = self._convert_sql('[dbo].[BIPUsers]')
|
||||
placeholder = self._get_placeholder()
|
||||
|
||||
# 根据数据库类型选择列名格式
|
||||
if self._db_type == DatabaseType.MYSQL:
|
||||
sql = f"""
|
||||
UPDATE {table_name}
|
||||
SET Password = {placeholder}
|
||||
WHERE UserName = {placeholder}
|
||||
"""
|
||||
else:
|
||||
sql = f"""
|
||||
UPDATE {table_name}
|
||||
SET [Password] = {placeholder}
|
||||
WHERE [UserName] = {placeholder}
|
||||
"""
|
||||
|
||||
try:
|
||||
with get_connection() as db:
|
||||
db.execute_update(sql, (new_password, username))
|
||||
@@ -141,10 +201,21 @@ class BIPUsersDAO:
|
||||
Returns:
|
||||
True if successful, False otherwise
|
||||
"""
|
||||
sql = """
|
||||
DELETE FROM [dbo].[BIPUsers]
|
||||
WHERE [UserName] = ?
|
||||
"""
|
||||
table_name = self._convert_sql('[dbo].[BIPUsers]')
|
||||
placeholder = self._get_placeholder()
|
||||
|
||||
# 根据数据库类型选择列名格式
|
||||
if self._db_type == DatabaseType.MYSQL:
|
||||
sql = f"""
|
||||
DELETE FROM {table_name}
|
||||
WHERE UserName = {placeholder}
|
||||
"""
|
||||
else:
|
||||
sql = f"""
|
||||
DELETE FROM {table_name}
|
||||
WHERE [UserName] = {placeholder}
|
||||
"""
|
||||
|
||||
try:
|
||||
with get_connection() as db:
|
||||
db.execute_update(sql, (username,))
|
||||
@@ -163,10 +234,21 @@ class BIPUsersDAO:
|
||||
Returns:
|
||||
True if username exists, False otherwise
|
||||
"""
|
||||
sql = """
|
||||
SELECT COUNT(*) as count FROM [dbo].[BIPUsers]
|
||||
WHERE [UserName] = ?
|
||||
"""
|
||||
table_name = self._convert_sql('[dbo].[BIPUsers]')
|
||||
placeholder = self._get_placeholder()
|
||||
|
||||
# 根据数据库类型选择列名格式
|
||||
if self._db_type == DatabaseType.MYSQL:
|
||||
sql = f"""
|
||||
SELECT COUNT(*) as count FROM {table_name}
|
||||
WHERE UserName = {placeholder}
|
||||
"""
|
||||
else:
|
||||
sql = f"""
|
||||
SELECT COUNT(*) as count FROM {table_name}
|
||||
WHERE [UserName] = {placeholder}
|
||||
"""
|
||||
|
||||
with get_connection() as db:
|
||||
results = db.execute_query(sql, (username,))
|
||||
return results[0]['count'] > 0 if results else False
|
||||
|
||||
Reference in New Issue
Block a user