refactor(admin): remove geoserver config

This commit is contained in:
2026-06-12 15:28:14 +08:00
parent a6e7a2e75c
commit d99f4cec6a
14 changed files with 14 additions and 420 deletions
@@ -9,9 +9,7 @@ from sqlalchemy.ext.asyncio import AsyncSession
from app.core.encryption import (
get_database_encryptor,
get_encryptor,
is_database_encryption_configured,
is_encryption_configured,
)
from app.infra.db.metadb import models
@@ -44,17 +42,6 @@ class ProjectDbRouting:
pool_max_size: int
@dataclass(frozen=True)
class ProjectGeoServerInfo:
project_id: UUID
gs_base_url: Optional[str]
gs_admin_user: Optional[str]
gs_admin_password: Optional[str]
gs_datastore_name: str
default_extent: Optional[dict]
srid: int
@dataclass(frozen=True)
class ProjectSummary:
project_id: UUID
@@ -76,7 +63,6 @@ class ProjectDetail:
gs_workspace: str
map_extent: Optional[dict]
status: str
geoserver: Optional[ProjectGeoServerInfo]
@dataclass(frozen=True)
@@ -100,12 +86,6 @@ def _encrypt_database_secret(value: str) -> str:
return get_database_encryptor().encrypt(value)
def _encrypt_general_secret(value: str) -> str:
if not is_encryption_configured():
raise ValueError("ENCRYPTION_KEY is not configured")
return get_encryptor().encrypt(value)
class MetadataRepository:
"""元数据访问层(system_hub"""
@@ -276,9 +256,6 @@ class MetadataRepository:
project = await self.get_project_by_code(code)
if not project:
return None
geoserver = await self.get_geoserver_config(project.id)
return ProjectDetail(
project_id=project.id,
name=project.name,
@@ -287,7 +264,6 @@ class MetadataRepository:
gs_workspace=project.gs_workspace,
map_extent=project.map_extent,
status=project.status,
geoserver=geoserver
)
async def get_membership_role(
@@ -469,88 +445,6 @@ class MetadataRepository:
pool_max_size=record.pool_max_size,
)
async def get_geoserver_config(
self, project_id: UUID
) -> Optional[ProjectGeoServerInfo]:
result = await self.session.execute(
select(models.ProjectGeoServerConfig).where(
models.ProjectGeoServerConfig.project_id == project_id
)
)
record = result.scalar_one_or_none()
if not record:
return None
if record.gs_admin_password_encrypted:
if is_encryption_configured():
encryptor = get_encryptor()
password = encryptor.decrypt(record.gs_admin_password_encrypted)
else:
password = record.gs_admin_password_encrypted
else:
password = None
return ProjectGeoServerInfo(
project_id=record.project_id,
gs_base_url=record.gs_base_url,
gs_admin_user=record.gs_admin_user,
gs_admin_password=password,
gs_datastore_name=record.gs_datastore_name,
default_extent=record.default_extent,
srid=record.srid,
)
async def get_geoserver_config_record(
self, project_id: UUID
) -> Optional[models.ProjectGeoServerConfig]:
result = await self.session.execute(
select(models.ProjectGeoServerConfig).where(
models.ProjectGeoServerConfig.project_id == project_id
)
)
return result.scalar_one_or_none()
async def upsert_geoserver_config(
self,
project_id: UUID,
*,
gs_base_url: str | None,
gs_admin_user: str | None,
gs_admin_password: str | None,
password_update_requested: bool,
gs_datastore_name: str,
default_extent: dict | None,
srid: int,
) -> models.ProjectGeoServerConfig:
record = await self.get_geoserver_config_record(project_id)
encrypted_password: str | None = None
if password_update_requested and gs_admin_password is not None:
encrypted_password = _encrypt_general_secret(gs_admin_password)
if record is None:
record = models.ProjectGeoServerConfig(
id=uuid4(),
project_id=project_id,
gs_base_url=gs_base_url,
gs_admin_user=gs_admin_user,
gs_admin_password_encrypted=encrypted_password,
gs_datastore_name=gs_datastore_name,
default_extent=default_extent,
srid=srid,
updated_at=_utcnow(),
)
self.session.add(record)
else:
record.gs_base_url = gs_base_url
record.gs_admin_user = gs_admin_user
if password_update_requested:
record.gs_admin_password_encrypted = encrypted_password
record.gs_datastore_name = gs_datastore_name
record.default_extent = default_extent
record.srid = srid
record.updated_at = _utcnow()
await self.session.commit()
await self.session.refresh(record)
return record
async def list_projects_for_user(self, user_id: UUID) -> List[ProjectSummary]:
stmt = (
select(models.Project, models.UserProjectMembership.project_role)