Doiiars

[DeepSentimentCrawling] 修正 MediaCrawler 数据库配置不匹配问题 (使用 postgresql 而非 postgres)

... ... @@ -57,7 +57,7 @@ class PlatformCrawler:
pg_password = config.settings.DB_PASSWORD if is_postgresql else "bettafish"
pg_user = config.settings.DB_USER if is_postgresql else "bettafish"
pg_host = config.settings.DB_HOST if is_postgresql else "127.0.0.1"
pg_port = config.settings.DB_PORT if is_postgresql else 5432
pg_port = config.settings.DB_PORT if is_postgresql else 5444
pg_db_name = config.settings.DB_NAME if is_postgresql else "bettafish"
# 替换数据库配置 - 使用MindSpider的数据库配置
... ... @@ -122,19 +122,19 @@ mongodb_config = {{
"db_name": MONGODB_DB_NAME,
}}
# postgres config - 使用MindSpider的数据库配置(如果DB_DIALECT是postgresql)或环境变量
POSTGRES_DB_PWD = os.getenv("POSTGRES_DB_PWD", "{pg_password}")
POSTGRES_DB_USER = os.getenv("POSTGRES_DB_USER", "{pg_user}")
POSTGRES_DB_HOST = os.getenv("POSTGRES_DB_HOST", "{pg_host}")
POSTGRES_DB_PORT = os.getenv("POSTGRES_DB_PORT", "{pg_port}")
POSTGRES_DB_NAME = os.getenv("POSTGRES_DB_NAME", "{pg_db_name}")
# postgresql config - 使用MindSpider的数据库配置(如果DB_DIALECT是postgresql)或环境变量
POSTGRESQL_DB_PWD = os.getenv("POSTGRESQL_DB_PWD", "{pg_password}")
POSTGRESQL_DB_USER = os.getenv("POSTGRESQL_DB_USER", "{pg_user}")
POSTGRESQL_DB_HOST = os.getenv("POSTGRESQL_DB_HOST", "{pg_host}")
POSTGRESQL_DB_PORT = os.getenv("POSTGRESQL_DB_PORT", "{pg_port}")
POSTGRESQL_DB_NAME = os.getenv("POSTGRESQL_DB_NAME", "{pg_db_name}")
postgres_db_config = {{
"user": POSTGRES_DB_USER,
"password": POSTGRES_DB_PWD,
"host": POSTGRES_DB_HOST,
"port": POSTGRES_DB_PORT,
"db_name": POSTGRES_DB_NAME,
postgresql_db_config = {{
"user": POSTGRESQL_DB_USER,
"password": POSTGRESQL_DB_PWD,
"host": POSTGRESQL_DB_HOST,
"port": POSTGRESQL_DB_PORT,
"db_name": POSTGRESQL_DB_NAME,
}}
'''
... ... @@ -169,7 +169,7 @@ postgres_db_config = {{
# 判断数据库类型,确定 SAVE_DATA_OPTION
db_dialect = (config.settings.DB_DIALECT or "mysql").lower()
is_postgresql = db_dialect in ("postgresql", "postgres")
save_data_option = "postgres" if is_postgresql else "db"
save_data_option = "postgresql" if is_postgresql else "db"
base_config_path = self.mediacrawler_path / "config" / "base_config.py"
... ... @@ -253,7 +253,7 @@ postgres_db_config = {{
# 判断数据库类型,确定 save_data_option
db_dialect = (config.settings.DB_DIALECT or "mysql").lower()
is_postgresql = db_dialect in ("postgresql", "postgres")
save_data_option = "postgres" if is_postgresql else "db"
save_data_option = "postgresql" if is_postgresql else "db"
# 构建命令
cmd = [
... ...