From fbbb75095fbe7746fb5bd90b96a4af2dca3b58eb Mon Sep 17 00:00:00 2001 From: ryan Date: Fri, 24 Jul 2026 15:28:39 +0800 Subject: [PATCH] refactor(structure): group platform, infra, and shared packages Move process wiring, technical adapters, and cross-cutting contracts out of flat internal/ packages so new code has a clear home without changing business layout. --- .agent/skills/cache-framework/SKILL.md | 4 +- .agent/skills/clickhouse-batchwriter/SKILL.md | 28 +++++------ .agent/skills/database-migration/SKILL.md | 20 ++++---- .agent/skills/file-upload/SKILL.md | 2 +- .../new-api/references/handler_example.go | 2 +- .agent/skills/new-async-task/SKILL.md | 18 +++---- .../references/CODE-EXAMPLES.md | 6 +-- .agent/skills/new-setting/SKILL.md | 10 ++-- .agent/skills/push-notification/SKILL.md | 4 +- AGENTS.md | 35 +++++++------ docs/PERFORMANCE.md | 12 ++--- internal/apps/admin/auth_source/routers.go | 2 +- .../apps/admin/auth_source/routers_test.go | 2 +- internal/apps/admin/cache/routers.go | 4 +- internal/apps/admin/db_manage/routers.go | 6 +-- internal/apps/admin/logs/routers.go | 6 +-- internal/apps/admin/logs/utils_test.go | 2 +- internal/apps/admin/middlewares.go | 2 +- internal/apps/admin/push/channels.go | 2 +- .../push/custom_events/admin_login_test.go | 2 +- internal/apps/admin/push/events.go | 2 +- internal/apps/admin/push/logics.go | 2 +- internal/apps/admin/push/push_test.go | 4 +- internal/apps/admin/push/routers.go | 2 +- internal/apps/admin/push/task_listener.go | 2 +- internal/apps/admin/push/tasks.go | 2 +- internal/apps/admin/status/routers.go | 6 +-- internal/apps/admin/system_config/logics.go | 12 ++--- internal/apps/admin/system_config/routers.go | 32 ++++++------ .../apps/admin/system_config/routers_test.go | 30 +++++------ internal/apps/admin/task/routers.go | 6 +-- internal/apps/admin/task/routers_test.go | 6 +-- internal/apps/admin/template/routers.go | 2 +- internal/apps/admin/template/routers_test.go | 2 +- internal/apps/admin/updater/routers.go | 2 +- internal/apps/admin/user/logics.go | 4 +- internal/apps/admin/user/routers.go | 2 +- internal/apps/admin/user/routers_test.go | 2 +- internal/apps/cap/manager.go | 4 +- internal/apps/cap/middleware.go | 2 +- internal/apps/cap/routers.go | 2 +- internal/apps/cap/routers_test.go | 2 +- internal/apps/cap/runtime_settings.go | 2 +- internal/apps/cap/runtime_settings_test.go | 2 +- internal/apps/config/routers.go | 2 +- internal/apps/config/routers_test.go | 2 +- .../apps/config/system_config_cache_test.go | 2 +- internal/apps/custom/routers.go | 2 +- internal/apps/health/routers.go | 2 +- internal/apps/oauth/cache.go | 2 +- internal/apps/oauth/cache_test.go | 2 +- internal/apps/oauth/handler_authorize.go | 8 +-- internal/apps/oauth/handler_callback.go | 10 ++-- .../apps/oauth/handler_external_accounts.go | 6 +-- internal/apps/oauth/handler_sources.go | 2 +- internal/apps/oauth/middlewares.go | 8 +-- internal/apps/oauth/oauth_test.go | 4 +- internal/apps/oauth/oauth_userinfo.go | 2 +- internal/apps/oauth/routers.go | 2 +- internal/apps/oauth/session.go | 2 +- internal/apps/oauth/session_context.go | 2 +- internal/apps/risk_control/logics.go | 6 +-- internal/apps/risk_control/middleware.go | 6 +-- internal/apps/risk_control/middleware_test.go | 4 +- internal/apps/upload/cache/access_cache.go | 6 +-- .../apps/upload/cache/access_cache_test.go | 2 +- internal/apps/upload/cache/meta_cache.go | 2 +- internal/apps/upload/cache/meta_cache_test.go | 2 +- internal/apps/upload/exports.go | 2 +- internal/apps/upload/filesrv/file_server.go | 8 +-- .../apps/upload/filesrv/file_server_test.go | 18 +++---- .../apps/upload/handler/file_management.go | 2 +- internal/apps/upload/handler/routers.go | 6 +-- internal/apps/upload/handler/routers_test.go | 18 +++---- internal/apps/upload/handler/stats.go | 2 +- internal/apps/upload/ingest/helpers.go | 10 ++-- internal/apps/upload/ingest/ingest_test.go | 18 +++---- internal/apps/upload/ingest/remove.go | 2 +- internal/apps/upload/stats/stats_counter.go | 2 +- .../apps/upload/stats/stats_counter_test.go | 2 +- internal/apps/upload/storage/access_state.go | 4 +- internal/apps/upload/storage/migration.go | 34 ++++++------- internal/apps/upload/storage/storage_ops.go | 6 +-- internal/apps/upload/task/cleanup.go | 8 +-- internal/apps/upload/task/rebuild_stats.go | 4 +- .../apps/upload/task/rebuild_stats_test.go | 2 +- .../apps/upload/task/storage_migration.go | 28 +++++------ .../task/storage_migration_task_test.go | 50 +++++++++---------- internal/apps/upload/task/tasks.go | 4 +- internal/apps/upload/task/tasks_test.go | 26 +++++----- internal/apps/user/access_tokens.go | 2 +- internal/apps/user/logics.go | 4 +- internal/apps/user/logics_test.go | 2 +- internal/apps/user/routers.go | 10 ++-- internal/apps/user/routers_test.go | 6 +-- internal/apps/user/tasks.go | 2 +- internal/cmd/all.go | 6 +-- internal/cmd/api.go | 2 +- internal/cmd/banner.go | 4 +- internal/cmd/banner_test.go | 4 +- internal/cmd/bootstrap.go | 2 +- internal/cmd/reset_passwd.go | 6 +-- internal/cmd/root.go | 4 +- internal/cmd/scheduler.go | 4 +- internal/cmd/worker.go | 4 +- internal/common/constants.go | 6 --- internal/{ => infra}/config/config.go | 0 internal/{ => infra}/config/config_test.go | 0 internal/{ => infra}/config/model.go | 0 internal/{ => infra}/diskcache/cache.go | 2 +- internal/{ => infra}/diskcache/cache_test.go | 2 +- .../{storage => infra/objectstore}/config.go | 6 +-- .../{storage => infra/objectstore}/http.go | 2 +- .../{storage => infra/objectstore}/local.go | 2 +- .../objectstore}/local_test.go | 2 +- .../{storage => infra/objectstore}/oss.go | 2 +- internal/{storage => infra/objectstore}/s3.go | 2 +- .../{storage => infra/objectstore}/storage.go | 4 +- .../objectstore}/storage_test.go | 4 +- .../{storage => infra/objectstore}/webdav.go | 2 +- .../persistence}/batchwriter/config.go | 0 .../persistence}/batchwriter/errs.go | 0 .../persistence}/batchwriter/writer.go | 0 .../persistence}/batchwriter/writer_test.go | 0 .../{db => infra/persistence}/clickhouse.go | 2 +- internal/{db => infra/persistence}/errs.go | 0 .../persistence}/idgen/snowflake.go | 2 +- .../persistence}/idgen/snowflake_test.go | 0 .../persistence}/migrator/clickhouse.go | 2 +- .../persistence}/migrator/clickhouse_test.go | 2 +- .../202606190001_create_user_access_logs.sql | 0 .../postgres/202606090001_initial_schema.sql | 0 .../202606100001_create_schedules.sql | 0 .../202606100002_access_token_is_admin.sql | 0 ...10001_remove_access_token_last_used_at.sql | 0 ...0002_alter_schedules_id_auto_increment.sql | 0 ...202606110003_rename_tables_to_w_prefix.sql | 0 ...10004_add_file_access_whitelist_config.sql | 0 .../202606110005_add_disk_cache_configs.sql | 0 ...606120001_add_login_session_ttl_config.sql | 0 ..._add_update_upstream_repository_config.sql | 0 .../202606130001_add_upload_access_mode.sql | 0 ...02606130002_expand_system_config_value.sql | 0 .../202606130003_add_storage_config.sql | 0 .../202606140001_create_push_tables.sql | 0 .../postgres/202606140003_add_system_user.sql | 0 .../202606140004_create_push_channels.sql | 0 ...6140005_update_system_cleanup_schedule.sql | 0 ...606150001_add_task_type_to_push_events.sql | 0 .../202606160001_remove_push_config.sql | 0 ...606170001_add_upload_composite_indexes.sql | 0 ...202606170002_create_upload_stats_table.sql | 0 .../202606170003_backfill_upload_stats.sql | 0 ...02606180001_drop_upload_storage_driver.sql | 0 .../sqlite/202606090001_initial_schema.sql | 0 .../sqlite/202606100001_create_schedules.sql | 0 .../202606100002_access_token_is_admin.sql | 0 ...10001_remove_access_token_last_used_at.sql | 0 ...0002_alter_schedules_id_auto_increment.sql | 0 ...202606110003_rename_tables_to_w_prefix.sql | 0 ...10004_add_file_access_whitelist_config.sql | 0 .../202606110005_add_disk_cache_configs.sql | 0 ...606120001_add_login_session_ttl_config.sql | 0 ..._add_update_upstream_repository_config.sql | 0 .../202606130001_add_upload_access_mode.sql | 0 ...02606130002_expand_system_config_value.sql | 0 .../202606130003_add_storage_config.sql | 0 .../202606140001_create_push_tables.sql | 0 .../sqlite/202606140003_add_system_user.sql | 0 .../202606140004_create_push_channels.sql | 0 ...6140005_update_system_cleanup_schedule.sql | 0 ...606150001_add_task_type_to_push_events.sql | 0 .../202606160001_remove_push_config.sql | 0 ...606170001_add_upload_composite_indexes.sql | 0 ...202606170002_create_upload_stats_table.sql | 0 .../202606170003_backfill_upload_stats.sql | 0 ...02606180001_drop_upload_storage_driver.sql | 0 .../persistence}/migrator/migrator.go | 4 +- .../persistence}/migrator/migrator_test.go | 4 +- .../{db => infra/persistence}/postgres.go | 2 +- .../persistence}/postgres_logger.go | 0 .../persistence}/postgres_logger_test.go | 0 internal/{db => infra/persistence}/redis.go | 2 +- .../{db => infra/persistence}/redis_test.go | 0 internal/{ => infra}/task/constants.go | 0 internal/{ => infra}/task/errs.go | 0 internal/{ => infra}/task/executor.go | 2 +- internal/{ => infra}/task/executor_test.go | 0 internal/{ => infra}/task/handler.go | 0 .../{ => infra}/task/handlers/register.go | 2 +- internal/{ => infra}/task/meta.go | 0 internal/{ => infra}/task/meta_test.go | 4 +- internal/{ => infra}/task/scheduler/errs.go | 0 .../{ => infra}/task/scheduler/scheduler.go | 4 +- .../task/scheduler/scheduler_test.go | 0 internal/{ => infra}/task/utils.go | 2 +- internal/{ => infra}/task/utils_test.go | 2 +- .../{ => infra}/task/worker/middlewares.go | 0 internal/{ => infra}/task/worker/worker.go | 6 +-- internal/model/auth_source.go | 2 +- internal/model/schedule.go | 2 +- internal/model/task_execution.go | 4 +- internal/model/task_execution_test.go | 2 +- internal/model/users.go | 6 +-- .../{ => platform}/bootstrap/bootstrap.go | 4 +- .../bootstrap/bootstrap_test.go | 0 .../{ => platform}/lifecycle/lifecycle.go | 0 internal/repository/analytics/access_log.go | 2 +- .../repository/analytics/access_log_stats.go | 2 +- .../repository/analytics/access_log_test.go | 2 +- .../repository/analytics/access_log_writer.go | 2 +- internal/repository/auth_source_cache.go | 2 +- internal/repository/auth_source_cache_test.go | 2 +- internal/repository/push_channel.go | 2 +- internal/repository/push_event.go | 2 +- internal/repository/push_history.go | 2 +- internal/repository/system_config.go | 2 +- internal/repository/system_config_admin.go | 2 +- internal/repository/system_config_cache.go | 2 +- internal/repository/system_config_test.go | 2 +- internal/repository/template.go | 2 +- internal/repository/upload.go | 2 +- internal/repository/upload_stat.go | 2 +- internal/repository/user.go | 2 +- internal/router/middlewares.go | 4 +- internal/router/root/default.go | 2 +- internal/router/router.go | 4 +- internal/shared/constants.go | 6 +++ internal/{common => shared}/errs.go | 2 +- internal/{common => shared}/response/abort.go | 0 .../{common => shared}/response/middleware.go | 0 .../response/middleware_test.go | 0 .../{common => shared}/response/response.go | 0 internal/testhelper/gin.go | 2 +- internal/testhelper/test_helper.go | 2 +- 235 files changed, 434 insertions(+), 429 deletions(-) delete mode 100644 internal/common/constants.go rename internal/{ => infra}/config/config.go (100%) rename internal/{ => infra}/config/config_test.go (100%) rename internal/{ => infra}/config/model.go (100%) rename internal/{ => infra}/diskcache/cache.go (98%) rename internal/{ => infra}/diskcache/cache_test.go (96%) rename internal/{storage => infra/objectstore}/config.go (97%) rename internal/{storage => infra/objectstore}/http.go (98%) rename internal/{storage => infra/objectstore}/local.go (99%) rename internal/{storage => infra/objectstore}/local_test.go (98%) rename internal/{storage => infra/objectstore}/oss.go (99%) rename internal/{storage => infra/objectstore}/s3.go (99%) rename internal/{storage => infra/objectstore}/storage.go (98%) rename internal/{storage => infra/objectstore}/storage_test.go (97%) rename internal/{storage => infra/objectstore}/webdav.go (99%) rename internal/{db => infra/persistence}/batchwriter/config.go (100%) rename internal/{db => infra/persistence}/batchwriter/errs.go (100%) rename internal/{db => infra/persistence}/batchwriter/writer.go (100%) rename internal/{db => infra/persistence}/batchwriter/writer_test.go (100%) rename internal/{db => infra/persistence}/clickhouse.go (98%) rename internal/{db => infra/persistence}/errs.go (100%) rename internal/{db => infra/persistence}/idgen/snowflake.go (95%) rename internal/{db => infra/persistence}/idgen/snowflake_test.go (100%) rename internal/{db => infra/persistence}/migrator/clickhouse.go (98%) rename internal/{db => infra/persistence}/migrator/clickhouse_test.go (95%) rename internal/{db => infra/persistence}/migrator/goose/clickhouse/202606190001_create_user_access_logs.sql (100%) rename internal/{db => infra/persistence}/migrator/goose/postgres/202606090001_initial_schema.sql (100%) rename internal/{db => infra/persistence}/migrator/goose/postgres/202606100001_create_schedules.sql (100%) rename internal/{db => infra/persistence}/migrator/goose/postgres/202606100002_access_token_is_admin.sql (100%) rename internal/{db => infra/persistence}/migrator/goose/postgres/202606110001_remove_access_token_last_used_at.sql (100%) rename internal/{db => infra/persistence}/migrator/goose/postgres/202606110002_alter_schedules_id_auto_increment.sql (100%) rename internal/{db => infra/persistence}/migrator/goose/postgres/202606110003_rename_tables_to_w_prefix.sql (100%) rename internal/{db => infra/persistence}/migrator/goose/postgres/202606110004_add_file_access_whitelist_config.sql (100%) rename internal/{db => infra/persistence}/migrator/goose/postgres/202606110005_add_disk_cache_configs.sql (100%) rename internal/{db => infra/persistence}/migrator/goose/postgres/202606120001_add_login_session_ttl_config.sql (100%) rename internal/{db => infra/persistence}/migrator/goose/postgres/202606120002_add_update_upstream_repository_config.sql (100%) rename internal/{db => infra/persistence}/migrator/goose/postgres/202606130001_add_upload_access_mode.sql (100%) rename internal/{db => infra/persistence}/migrator/goose/postgres/202606130002_expand_system_config_value.sql (100%) rename internal/{db => infra/persistence}/migrator/goose/postgres/202606130003_add_storage_config.sql (100%) rename internal/{db => infra/persistence}/migrator/goose/postgres/202606140001_create_push_tables.sql (100%) rename internal/{db => infra/persistence}/migrator/goose/postgres/202606140003_add_system_user.sql (100%) rename internal/{db => infra/persistence}/migrator/goose/postgres/202606140004_create_push_channels.sql (100%) rename internal/{db => infra/persistence}/migrator/goose/postgres/202606140005_update_system_cleanup_schedule.sql (100%) rename internal/{db => infra/persistence}/migrator/goose/postgres/202606150001_add_task_type_to_push_events.sql (100%) rename internal/{db => infra/persistence}/migrator/goose/postgres/202606160001_remove_push_config.sql (100%) rename internal/{db => infra/persistence}/migrator/goose/postgres/202606170001_add_upload_composite_indexes.sql (100%) rename internal/{db => infra/persistence}/migrator/goose/postgres/202606170002_create_upload_stats_table.sql (100%) rename internal/{db => infra/persistence}/migrator/goose/postgres/202606170003_backfill_upload_stats.sql (100%) rename internal/{db => infra/persistence}/migrator/goose/postgres/202606180001_drop_upload_storage_driver.sql (100%) rename internal/{db => infra/persistence}/migrator/goose/sqlite/202606090001_initial_schema.sql (100%) rename internal/{db => infra/persistence}/migrator/goose/sqlite/202606100001_create_schedules.sql (100%) rename internal/{db => infra/persistence}/migrator/goose/sqlite/202606100002_access_token_is_admin.sql (100%) rename internal/{db => infra/persistence}/migrator/goose/sqlite/202606110001_remove_access_token_last_used_at.sql (100%) rename internal/{db => infra/persistence}/migrator/goose/sqlite/202606110002_alter_schedules_id_auto_increment.sql (100%) rename internal/{db => infra/persistence}/migrator/goose/sqlite/202606110003_rename_tables_to_w_prefix.sql (100%) rename internal/{db => infra/persistence}/migrator/goose/sqlite/202606110004_add_file_access_whitelist_config.sql (100%) rename internal/{db => infra/persistence}/migrator/goose/sqlite/202606110005_add_disk_cache_configs.sql (100%) rename internal/{db => infra/persistence}/migrator/goose/sqlite/202606120001_add_login_session_ttl_config.sql (100%) rename internal/{db => infra/persistence}/migrator/goose/sqlite/202606120002_add_update_upstream_repository_config.sql (100%) rename internal/{db => infra/persistence}/migrator/goose/sqlite/202606130001_add_upload_access_mode.sql (100%) rename internal/{db => infra/persistence}/migrator/goose/sqlite/202606130002_expand_system_config_value.sql (100%) rename internal/{db => infra/persistence}/migrator/goose/sqlite/202606130003_add_storage_config.sql (100%) rename internal/{db => infra/persistence}/migrator/goose/sqlite/202606140001_create_push_tables.sql (100%) rename internal/{db => infra/persistence}/migrator/goose/sqlite/202606140003_add_system_user.sql (100%) rename internal/{db => infra/persistence}/migrator/goose/sqlite/202606140004_create_push_channels.sql (100%) rename internal/{db => infra/persistence}/migrator/goose/sqlite/202606140005_update_system_cleanup_schedule.sql (100%) rename internal/{db => infra/persistence}/migrator/goose/sqlite/202606150001_add_task_type_to_push_events.sql (100%) rename internal/{db => infra/persistence}/migrator/goose/sqlite/202606160001_remove_push_config.sql (100%) rename internal/{db => infra/persistence}/migrator/goose/sqlite/202606170001_add_upload_composite_indexes.sql (100%) rename internal/{db => infra/persistence}/migrator/goose/sqlite/202606170002_create_upload_stats_table.sql (100%) rename internal/{db => infra/persistence}/migrator/goose/sqlite/202606170003_backfill_upload_stats.sql (100%) rename internal/{db => infra/persistence}/migrator/goose/sqlite/202606180001_drop_upload_storage_driver.sql (100%) rename internal/{db => infra/persistence}/migrator/migrator.go (95%) rename internal/{db => infra/persistence}/migrator/migrator_test.go (97%) rename internal/{db => infra/persistence}/postgres.go (99%) rename internal/{db => infra/persistence}/postgres_logger.go (100%) rename internal/{db => infra/persistence}/postgres_logger_test.go (100%) rename internal/{db => infra/persistence}/redis.go (99%) rename internal/{db => infra/persistence}/redis_test.go (100%) rename internal/{ => infra}/task/constants.go (100%) rename internal/{ => infra}/task/errs.go (100%) rename internal/{ => infra}/task/executor.go (99%) rename internal/{ => infra}/task/executor_test.go (100%) rename internal/{ => infra}/task/handler.go (100%) rename internal/{ => infra}/task/handlers/register.go (96%) rename internal/{ => infra}/task/meta.go (100%) rename internal/{ => infra}/task/meta_test.go (84%) rename internal/{ => infra}/task/scheduler/errs.go (100%) rename internal/{ => infra}/task/scheduler/scheduler.go (96%) rename internal/{ => infra}/task/scheduler/scheduler_test.go (100%) rename internal/{ => infra}/task/utils.go (98%) rename internal/{ => infra}/task/utils_test.go (97%) rename internal/{ => infra}/task/worker/middlewares.go (100%) rename internal/{ => infra}/task/worker/worker.go (90%) rename internal/{ => platform}/bootstrap/bootstrap.go (97%) rename internal/{ => platform}/bootstrap/bootstrap_test.go (100%) rename internal/{ => platform}/lifecycle/lifecycle.go (100%) create mode 100644 internal/shared/constants.go rename internal/{common => shared}/errs.go (93%) rename internal/{common => shared}/response/abort.go (100%) rename internal/{common => shared}/response/middleware.go (100%) rename internal/{common => shared}/response/middleware_test.go (100%) rename internal/{common => shared}/response/response.go (100%) diff --git a/.agent/skills/cache-framework/SKILL.md b/.agent/skills/cache-framework/SKILL.md index cc4da7da..620409a4 100644 --- a/.agent/skills/cache-framework/SKILL.md +++ b/.agent/skills/cache-framework/SKILL.md @@ -125,7 +125,7 @@ func startThingCacheInvalidationListener() { | Auth Source | `repository/auth_source_cache.go` | Otter | Redis JSON | `oauth:auth_source_invalidation` ✅ | | OAuth 用户/Token | `apps/oauth/cache.go` | 自研 map | Redis JSON | ❌ 无 pub/sub（历史债） | | 推送渠道 | `repository/push_channel.go` | 无 | Redis JSON | ❌ 仅 Redis Del | -| Storage 驱动 | `internal/storage/storage.go` | RWMutex 快照 | — | `storage:config_invalidation` ✅ | +| Storage 驱动 | `internal/infra/objectstore/storage.go` | RWMutex 快照 | — | `storage:config_invalidation` ✅ | ## 新增缓存工作流 @@ -210,7 +210,7 @@ make code-check ## 相关文件 - L1 引擎：`pkg/cache/ram/cache.go` -- DB/Redis 助手：`internal/db/redis.go`（`GetJSON`, `SetJSON`, `HGetJSON`, `PrefixedKey`） +- DB/Redis 助手：`internal/infra/persistence/redis.go`（`GetJSON`, `SetJSON`, `HGetJSON`, `PrefixedKey`） - 金标准：`internal/repository/system_config_cache.go` - 上传元数据：`internal/apps/upload/cache/meta_cache.go` - Auth Source：`internal/repository/auth_source_cache.go` diff --git a/.agent/skills/clickhouse-batchwriter/SKILL.md b/.agent/skills/clickhouse-batchwriter/SKILL.md index 60845b0a..e9f29c80 100644 --- a/.agent/skills/clickhouse-batchwriter/SKILL.md +++ b/.agent/skills/clickhouse-batchwriter/SKILL.md @@ -1,6 +1,6 @@ --- name: "clickhouse-batchwriter" -description: "Wavelet 项目专用：当新增或修改 ClickHouse 批量写入、接入 internal/db/batchwriter、将业务域异步 flush 到分析表、迁移 risk_control/节点访问日志/可观测时序写入、或评估 async_insert 与背压策略时必须使用。本技能指导分层职责、各域独立 Writer 实例、repository 批量 API 与禁止写法。" +description: "Wavelet 项目专用：当新增或修改 ClickHouse 批量写入、接入 internal/infra/persistence/batchwriter、将业务域异步 flush 到分析表、迁移 risk_control/节点访问日志/可观测时序写入、或评估 async_insert 与背压策略时必须使用。本技能指导分层职责、各域独立 Writer 实例、repository 批量 API 与禁止写法。" --- # ClickHouse 批量写入开发 @@ -13,13 +13,13 @@ DDL 与表结构变更见 `database-migration` 技能；本技能只覆盖**运 | 层级 | 路径 | 职责 | | :--- | :--- | :--- | -| 连接 | `internal/db/clickhouse.go` | `ChConn`（原生批量写）、`ChDB`（GORM 查询）；禁止在业务包直接 `clickhouse.Open` | -| 批量框架 | `internal/db/batchwriter/` | 泛型队列 + 按条数/时间 flush + 非阻塞入队 + 优雅停机；**各业务域独立实例** | +| 连接 | `internal/infra/persistence/clickhouse.go` | `ChConn`（原生批量写）、`ChDB`（GORM 查询）；禁止在业务包直接 `clickhouse.Open` | +| 批量框架 | `internal/infra/persistence/batchwriter/` | 泛型队列 + 按条数/时间 flush + 非阻塞入队 + 优雅停机；**各业务域独立实例** | | Model | `internal/model/analytics/` | 列定义、`TableName()`、`BatchInsertSQL()`（及可选 `InsertColumns()`） | | Repository | `internal/repository/analytics/` | `BatchInsert*` / `BatchInsertNodeAccessLogs` 等；`PrepareBatch` + 多行 `Append` + 一次 `Send` | | Apps | `internal/apps//` | 采集、入队、背压；`FlushFunc` 只调 repository，不写 SQL、不 `PrepareBatch` | -| 装配 | `internal/bootstrap/bootstrap.go` | 进程启动时调用 `Writer.Start`；初始化时需调用 `lifecycle.OnShutdown` 挂载停机钩子 | -| 生命周期 | `internal/lifecycle/lifecycle.go` | 统一协调全局并发优雅停机，业务包无需在 `bootstrap.go` 中硬编码 `Stop` 逻辑 | +| 装配 | `internal/platform/bootstrap/bootstrap.go` | 进程启动时调用 `Writer.Start`；初始化时需调用 `lifecycle.OnShutdown` 挂载停机钩子 | +| 生命周期 | `internal/platform/lifecycle/lifecycle.go` | 统一协调全局并发优雅停机，业务包无需在 `bootstrap.go` 中硬编码 `Stop` 逻辑 | **禁止**在 Handler / middleware 内直接 `db.ChConn.PrepareBatch`；**禁止**在 repository 内启动 goroutine 或维护全局 channel（队列生命周期由 apps + bootstrap 或专用 writer 包负责）。 @@ -68,7 +68,7 @@ writer.Stop(stopCtx) // close 队列 + drain + 最终 flush ## 新增 ClickHouse 写入工作流 1. **Model**：在 `internal/model/analytics/` 定义 struct 与 `BatchInsertSQL()`（列顺序与 goose DDL 一致）。 -2. **Goose DDL**：在 `internal/db/migrator/goose/clickhouse/` 新增迁移（见 `database-migration`）。 +2. **Goose DDL**：在 `internal/infra/persistence/migrator/goose/clickhouse/` 新增迁移（见 `database-migration`）。 3. **Repository**：实现 `BatchInsertX(ctx, []analyticsmodel.X) error`： - `len(items)==0` 直接返回 - `db.ChConn == nil` 返回明确错误 @@ -78,7 +78,7 @@ writer.Stop(stopCtx) // close 队列 + drain + 最终 flush - 业务路径 `TryEnqueue`；HTTP 背压用 `IsFull()` 5. **测试**： - repository：mock `ChConn` 验证 `BatchInsertSQL` 与 append 列数 - - batchwriter：`go test ./internal/db/batchwriter` + - batchwriter：`go test ./internal/infra/persistence/batchwriter` 6. 运行 `make code-check`；有 API 变更时 `make swagger`。 ## 背压与丢弃策略 @@ -110,7 +110,7 @@ var globalChan chan any ## async_insert（补充，非主方案） -可在 `internal/db/clickhouse.go` 的 `Settings` 增加服务端异步写入作为第二层防护： +可在 `internal/infra/persistence/clickhouse.go` 的 `Settings` 增加服务端异步写入作为第二层防护： ```go "async_insert": 1, @@ -122,7 +122,7 @@ var globalChan chan any ## Bootstrap 装配示例 ```go -// internal/bootstrap/bootstrap.go（示意） +// internal/platform/bootstrap/bootstrap.go（示意） var userAccessLogWriter *batchwriter.Writer[*analytics.UserAccessLog] func RegisterAPI(ctx context.Context) { @@ -141,7 +141,7 @@ func RegisterAPI(ctx context.Context) { ## 验证清单 ```bash -go test ./internal/db/batchwriter +go test ./internal/infra/persistence/batchwriter go test ./internal/repository/analytics make code-check ``` @@ -153,11 +153,11 @@ make code-check ## 相关文件速查 -- 框架：`internal/db/batchwriter/{config,writer,errs}.go` -- 连接：`internal/db/clickhouse.go` +- 框架：`internal/infra/persistence/batchwriter/{config,writer,errs}.go` +- 连接：`internal/infra/persistence/clickhouse.go` - 审计写入：`internal/apps/risk_control/logics.go` - OpenFlare 写入胶水：`internal/apps/openflare/chwriter/writer.go` - 节点访问日志 repository：`internal/repository/analytics/node_access_log_writer.go` - 可观测 repository：`internal/repository/analytics/node_observability_writer.go` -- 生命周期管理器：`internal/lifecycle/lifecycle.go` -- Bootstrap：`internal/bootstrap/bootstrap.go` \ No newline at end of file +- 生命周期管理器：`internal/platform/lifecycle/lifecycle.go` +- Bootstrap：`internal/platform/bootstrap/bootstrap.go` \ No newline at end of file diff --git a/.agent/skills/database-migration/SKILL.md b/.agent/skills/database-migration/SKILL.md index 48731b1d..59f416f4 100644 --- a/.agent/skills/database-migration/SKILL.md +++ b/.agent/skills/database-migration/SKILL.md @@ -1,17 +1,17 @@ --- name: "database-migration" -description: "Wavelet 项目专用：当新增或修改数据库表结构、索引、初始化数据、系统配置 seed、模板 seed、默认管理员、goose SQL 迁移、internal/db/migrator、ClickHouse 分析库 DDL 或数据库升级流程时必须使用。本技能指导在 internal/db/migrator/goose 下编写 PostgreSQL/SQLite 双方言 SQL 迁移，以及在 goose/clickhouse 下编写 ClickHouse 单方言分析表迁移，并完成验证。" +description: "Wavelet 项目专用：当新增或修改数据库表结构、索引、初始化数据、系统配置 seed、模板 seed、默认管理员、goose SQL 迁移、internal/infra/persistence/migrator、ClickHouse 分析库 DDL 或数据库升级流程时必须使用。本技能指导在 internal/infra/persistence/migrator/goose 下编写 PostgreSQL/SQLite 双方言 SQL 迁移，以及在 goose/clickhouse 下编写 ClickHouse 单方言分析表迁移，并完成验证。" --- # Wavelet 数据库升级操作指南 -Wavelet 使用 `github.com/pressly/goose/v3` 执行 SQL 迁移。迁移入口是 `internal/db/migrator.Migrate()`，SQL 文件嵌入在二进制中。 +Wavelet 使用 `github.com/pressly/goose/v3` 执行 SQL 迁移。迁移入口是 `internal/infra/persistence/migrator.Migrate()`，SQL 文件嵌入在二进制中。 ## 基本规则 - SQL 迁移文件放在： - - `internal/db/migrator/goose/postgres/` - - `internal/db/migrator/goose/sqlite/` + - `internal/infra/persistence/migrator/goose/postgres/` + - `internal/infra/persistence/migrator/goose/sqlite/` - PostgreSQL 和 SQLite 必须使用同一个版本号、同一个语义文件名。 - 迁移文件使用 goose SQL 标记： @@ -51,7 +51,7 @@ Wavelet 使用 `github.com/pressly/goose/v3` 执行 SQL 迁移。迁移入口是 7. 至少运行： ```bash -go test ./internal/db/migrator +go test ./internal/infra/persistence/migrator go test ./internal/model ./internal/apps/config ./internal/apps/admin/system_config make code-check ``` @@ -89,10 +89,10 @@ ClickHouse 是**辅助 OLAP 存储**，与 PostgreSQL/SQLite 主库**完全独 | 路径 | 职责 | | :--- | :--- | -| `internal/db/migrator/goose/clickhouse/` | **唯一** ClickHouse DDL 来源（goose SQL，嵌入二进制） | +| `internal/infra/persistence/migrator/goose/clickhouse/` | **唯一** ClickHouse DDL 来源（goose SQL，嵌入二进制） | | `internal/model/analytics/` | 分析表 Go model，列名须与 goose DDL 一致 | | `internal/repository/analytics/` | 所有 ClickHouse 读写（批量写入、查询、聚合） | -| `internal/db/clickhouse.go` | 连接初始化（`ChConn` 原生批量、`chDB` GORM 查询） | +| `internal/infra/persistence/clickhouse.go` | 连接初始化（`ChConn` 原生批量、`chDB` GORM 查询） | ### 迁移入口与版本表 @@ -116,16 +116,16 @@ ClickHouse 是**辅助 OLAP 存储**，与 PostgreSQL/SQLite 主库**完全独 按以下顺序落地，避免列名或类型漂移： 1. **Model**：在 `internal/model/analytics/` 定义 struct，`gorm:"column:..."` 与 DDL 列名一一对应；实现 `TableName()`，批量写入表可提供 `InsertColumns()` / `BatchInsertSQL()`。 -2. **Goose SQL**：在 `internal/db/migrator/goose/clickhouse/` 新增递增版本文件（格式同主库，如 `YYYYMMDDNNNN_create_xxx.sql`），编写 `-- +goose Up` / `-- +goose Down`。 +2. **Goose SQL**：在 `internal/infra/persistence/migrator/goose/clickhouse/` 新增递增版本文件（格式同主库，如 `YYYYMMDDNNNN_create_xxx.sql`），编写 `-- +goose Up` / `-- +goose Down`。 3. **Repository**：在 `internal/repository/analytics/` 实现 `BatchInsert*`（`db.ChConn` 一次 `PrepareBatch` + 多行 `Append` + 一次 `Send`）与查询（`db.ChDB`）；连接未初始化时返回明确错误，**不要**在 handler 写 SQL，**不要**在 repository 内维护 channel/goroutine。 -4. **Apps**：在 `internal/apps//` 编排采集与入队；高频写入通过 `internal/db/batchwriter` 各域独立实例异步 flush（详见 `clickhouse-batchwriter` 技能），`FlushFunc` 只调 repository `BatchInsert*`；管理端统计 API 只读 repository，不触达 DDL。 +4. **Apps**：在 `internal/apps//` 编排采集与入队；高频写入通过 `internal/infra/persistence/batchwriter` 各域独立实例异步 flush（详见 `clickhouse-batchwriter` 技能），`FlushFunc` 只调 repository `BatchInsert*`；管理端统计 API 只读 repository，不触达 DDL。 ### ClickHouse 验证 至少运行： ```bash -go test ./internal/db/migrator +go test ./internal/infra/persistence/migrator go test ./internal/repository/analytics make code-check ``` diff --git a/.agent/skills/file-upload/SKILL.md b/.agent/skills/file-upload/SKILL.md index e0ec144e..a2d5aae3 100644 --- a/.agent/skills/file-upload/SKILL.md +++ b/.agent/skills/file-upload/SKILL.md @@ -15,7 +15,7 @@ Wavelet 将「对象存储」与「上传业务」分为两层，**禁止混用 | 层级 | 包路径 | 职责 | 业务是否直接调用 | | :--- | :--- | :--- | :--- | -| **对象存储引擎** | `internal/storage` | `Backend` 接口：`Put` / `Get` / `Delete` / `Test`；按配置切换 Local / S3 / R2 / OSS / WebDAV | **禁止**（仅 upload 域内部使用） | +| **对象存储引擎** | `internal/infra/objectstore` | `Backend` 接口：`Put` / `Get` / `Delete` / `Test`；按配置切换 Local / S3 / R2 / OSS / WebDAV | **禁止**（仅 upload 域内部使用） | | **上传域服务** | `internal/apps/upload` | `w_uploads` 记录、权限、秒传、统计、文件服务、`upload.Ingest` | **必须** | | **上传 HTTP 入口** | `internal/apps/upload/handler` | `POST /api/v1/upload` 等 multipart 接口 | 前端 / 用户侧上传 | | **文件访问** | `internal/apps/upload/filesrv` | `GET /f/:id` 流式响应、访问控制、图片 WebP 压缩 | 展示 / 下载 | diff --git a/.agent/skills/new-api/references/handler_example.go b/.agent/skills/new-api/references/handler_example.go index c8efcddb..f62d7f6b 100644 --- a/.agent/skills/new-api/references/handler_example.go +++ b/.agent/skills/new-api/references/handler_example.go @@ -6,7 +6,7 @@ package references import ( "net/http" - "github.com/Rain-kl/Wavelet/internal/common/response" + "github.com/Rain-kl/Wavelet/internal/shared/response" "github.com/gin-gonic/gin" ) diff --git a/.agent/skills/new-async-task/SKILL.md b/.agent/skills/new-async-task/SKILL.md index 99f2b42e..c59e5268 100644 --- a/.agent/skills/new-async-task/SKILL.md +++ b/.agent/skills/new-async-task/SKILL.md @@ -11,13 +11,13 @@ description: "Wavelet 项目专用：新增或修改 Asynq 异步任务、后台 按任务范围检查当前实现： -- `internal/task/handler.go`：`TaskHandler`、`TaskResult`、`PayloadValidator` -- `internal/task/meta.go`：`TaskMeta`、`TaskParam` -- `internal/task/executor.go`：下发、执行、日志、重试、`OnTaskCompleted` 订阅 -- `internal/task/handlers/register.go`：Handler 和元数据注册（由 bootstrap 调用） -- `internal/bootstrap/bootstrap.go`：任务注册与进程级装配入口 -- `internal/task/worker/worker.go`：Worker 路由和队列 -- `internal/task/scheduler/scheduler.go`：定时调度 +- `internal/infra/task/handler.go`：`TaskHandler`、`TaskResult`、`PayloadValidator` +- `internal/infra/task/meta.go`：`TaskMeta`、`TaskParam` +- `internal/infra/task/executor.go`：下发、执行、日志、重试、`OnTaskCompleted` 订阅 +- `internal/infra/task/handlers/register.go`：Handler 和元数据注册（由 bootstrap 调用） +- `internal/platform/bootstrap/bootstrap.go`：任务注册与进程级装配入口 +- `internal/infra/task/worker/worker.go`：Worker 路由和队列 +- `internal/infra/task/scheduler/scheduler.go`：定时调度 - `internal/apps/admin/task/routers.go`：Admin 任务 API - `internal/model/task_execution.go`：执行记录和日志持久化 @@ -46,7 +46,7 @@ description: "Wavelet 项目专用：新增或修改 Asynq 异步任务、后台 ### 注册 -- 在 `internal/task/handlers/register.go` 同时注册 Handler 和 `TaskMeta`。 +- 在 `internal/infra/task/handlers/register.go` 同时注册 Handler 和 `TaskMeta`。 - 不要在其他位置单独注册任务。 - **禁止**在业务包 `routers.go` 或 `init()` 中调用 `task.RegisterHandler`；统一由 `bootstrap.RegisterTasks()` → `taskhandlers.Register()` 在进程启动时装配。 - 任务完成钩子（如 push 通知）通过 `task.OnTaskCompleted` 注册，在 `bootstrap.RegisterTaskListeners()` 中装配（Worker/`all` 进程）。 @@ -92,7 +92,7 @@ description: "Wavelet 项目专用：新增或修改 Asynq 异步任务、后台 - `Retryable=true` - `RetryCount < MaxRetry` - 修改重试行为时同时检查： - - `internal/task/executor.go` + - `internal/infra/task/executor.go` - `internal/model/task_execution.go` - `internal/apps/admin/task/routers.go` - 前端任务执行列表 diff --git a/.agent/skills/new-async-task/references/CODE-EXAMPLES.md b/.agent/skills/new-async-task/references/CODE-EXAMPLES.md index ffa77c0f..212daca3 100644 --- a/.agent/skills/new-async-task/references/CODE-EXAMPLES.md +++ b/.agent/skills/new-async-task/references/CODE-EXAMPLES.md @@ -163,7 +163,7 @@ func (h *SendEmailHandler) Execute(ctx context.Context, payload []byte) (*task.T ## 统一注册 -在 `internal/task/handlers/register.go` 注册。Admin dispatch 的 `ValidateAndNormalizePayload` 和 Worker 执行都依赖这里。 +在 `internal/infra/task/handlers/register.go` 注册。Admin dispatch 的 `ValidateAndNormalizePayload` 和 Worker 执行都依赖这里。 ```go package handlers @@ -184,7 +184,7 @@ func Register() { 系统默认的定时任务必须通过 Goose SQL 迁移初始化插入到 `schedules` 表。 -在 `internal/db/migrator/goose/postgres` 下的示例： +在 `internal/infra/persistence/migrator/goose/postgres` 下的示例： ```sql -- +goose Up @@ -274,4 +274,4 @@ func TestDispatchTaskValidatesPayload(t *testing.T) { } ``` -需要 Redis/Asynq 时优先复用项目现有测试模式；没有现成依赖时可用 `miniredis` 初始化 `task.AsynqClient`。不要把 `internal/task` 依赖塞进通用 testhelper 造成 import cycle。 +需要 Redis/Asynq 时优先复用项目现有测试模式；没有现成依赖时可用 `miniredis` 初始化 `task.AsynqClient`。不要把 `internal/infra/task` 依赖塞进通用 testhelper 造成 import cycle。 diff --git a/.agent/skills/new-setting/SKILL.md b/.agent/skills/new-setting/SKILL.md index 34c4c80b..99b9d60e 100644 --- a/.agent/skills/new-setting/SKILL.md +++ b/.agent/skills/new-setting/SKILL.md @@ -31,8 +31,8 @@ Wavelet 当前有两套设置入口： 修改前快速查看这些文件，确认当前实现没有漂移： - `internal/model/system_configs.go`: 配置 key 常量、`SystemConfig` 模型、`GetByKey`、`GetBoolByKey`、`GetIntByKey`、`GetDecimalByKey` 等读取方法。 -- `internal/db/migrator/goose/postgres/*.sql` 和 `internal/db/migrator/goose/sqlite/*.sql`: `system_configs` 表结构、初始化 seed、后续升级迁移。 -- `internal/db/migrator/migrator.go`: goose 迁移入口和 PostgreSQL/SQLite 方言选择。 +- `internal/infra/persistence/migrator/goose/postgres/*.sql` 和 `internal/infra/persistence/migrator/goose/sqlite/*.sql`: `system_configs` 表结构、初始化 seed、后续升级迁移。 +- `internal/infra/persistence/migrator/migrator.go`: goose 迁移入口和 PostgreSQL/SQLite 方言选择。 - `internal/testhelper/test_helper.go`: Go 测试用默认系统配置 seed。 - `internal/apps/admin/system_config/routers.go`: `/api/v1/admin/system-configs` 参数表 API。 - `internal/apps/config/routers.go`: `/api/v1/config/public` 公共配置响应。 @@ -52,7 +52,7 @@ Wavelet 当前有两套设置入口： - 值仍存为字符串；布尔值用 `"true"` / `"false"`，数值用十进制字符串，复杂结构用 JSON 字符串。 2. 初始化默认配置。 - - 如果修改初始 schema，必须同步 `internal/db/migrator/goose/postgres/` 和 `internal/db/migrator/goose/sqlite/` 中的 goose SQL。 + - 如果修改初始 schema，必须同步 `internal/infra/persistence/migrator/goose/postgres/` 和 `internal/infra/persistence/migrator/goose/sqlite/` 中的 goose SQL。 - 既有库新增配置时，新增一组时间戳递增的双 SQL 迁移文件，分别放在 PostgreSQL 和 SQLite 目录；不要回到 GORM AutoMigrate 或 Go 代码 seed。 - 新库初始化也需要包含同一个默认 key：当前初始 seed 在 `202606090001_initial_schema.sql` 的 `INSERT INTO system_configs (...) VALUES ... ON CONFLICT (key) DO NOTHING`。 - 设置正确的 `Type`：只能是 `"system"` 或 `"business"`。 @@ -62,7 +62,7 @@ Wavelet 当前有两套设置入口： 3. 读取配置。 - 后端业务代码优先使用 `model.GetBoolByKey`、`model.GetIntByKey`、`model.GetDecimalByKey` 或 `SystemConfig.GetByKey`。 - - 运行时可热更新的规则不要放进 `config.Config`；启动时设置才走 `internal/config/model.go` 和 `config.example.yaml`。 + - 运行时可热更新的规则不要放进 `config.Config`；启动时设置才走 `internal/infra/config/model.go` 和 `config.example.yaml`。 - 不要在 handler 或业务代码里直接读 `os.Getenv()`。 4. 如果前端需要未登录或全局消费，暴露为公共可见配置。 @@ -89,7 +89,7 @@ Wavelet 当前有两套设置入口： 只有在配置必须随进程启动确定、不能或不应热更新时，才走启动时设置。 -1. 在 `internal/config/model.go` 添加配置字段。 +1. 在 `internal/infra/config/model.go` 添加配置字段。 2. 在 `config.example.yaml` 添加示例值和说明。 3. 确认 Viper 现有加载逻辑能绑定该字段；需要环境变量时沿用当前命名和绑定方式。 4. 运行时代码从 `config.Config.
.` 读取。 diff --git a/.agent/skills/push-notification/SKILL.md b/.agent/skills/push-notification/SKILL.md index 4e4e0f12..4de0cccb 100644 --- a/.agent/skills/push-notification/SKILL.md +++ b/.agent/skills/push-notification/SKILL.md @@ -19,7 +19,7 @@ Wavelet 的消息推送机制采用了**元数据驱动 + 统一触发器 + 异 | **`internal/apps/admin/push/`** | 通知服务与后台任务层 | 包含以下核心文件：
1. [events.go](file:///Users/ryan/DEV/Go/Wavelet/internal/apps/admin/push/events.go)：定义通知事件的结构模型（`NotificationMessage`, `EventMetadata`）、内置事件的动态注册中心（`BuiltInEvents` 及 `RegisterBuiltInEvent` 函数）以及统一触发器类 `EventTrigger`（包括其底层的派发引擎逻辑）。
2. [tasks.go](file:///Users/ryan/DEV/Go/Wavelet/internal/apps/admin/push/tasks.go)：定义 Asynq 后台异步发送任务、处理器 `PushHandler` 及其校验逻辑，并记录推送历史审计。
3. [routers.go](file:///Users/ryan/DEV/Go/Wavelet/internal/apps/admin/push/routers.go)：管理端接口，负责获取事件配置列表和更新配置。 | | **`internal/apps/admin/push/custom_events/`** | 自定义通知事件包 | 事件元数据定义与 push 侧处理逻辑；**一个 Go 文件代表一个事件**。在 [register.go](file:///Users/ryan/DEV/Go/Wavelet/internal/apps/admin/push/custom_events/register.go) 统一装配，禁止 `init()` 副作用。 | | **`internal/listener/`** | 域事件分发层 | 核心域发射事件（如 `EmitAdminLoggedIn`），push 在 bootstrap 阶段通过 `OnAdminLoggedIn` 订阅，避免 auth/user 直接依赖 push。 | -| **`internal/bootstrap/`** | 应用装配根 | `RegisterPushDomainEvents()` 调用 `custom_events.Register()`；`Init` 中执行 `SyncEvents` 将内置事件元数据同步到数据库。 | +| **`internal/platform/bootstrap/`** | 应用装配根 | `RegisterPushDomainEvents()` 调用 `custom_events.Register()`；`Init` 中执行 `SyncEvents` 将内置事件元数据同步到数据库。 | | **数据库审计表** | 状态与历史审计 | `w_push_events` 存放每个通知事件的启用状态、启用渠道、发送目标和自定义渲染模板。
`w_push_histories` 存放消息发送记录用于审计。 | --- @@ -168,4 +168,4 @@ func Register(c *gin.Context) { ### 3. 禁止 init() 与 router 副作用注册 (Explicit Bootstrap) - 不得在 `init()` 中调用 `RegisterBuiltInEvent` 或订阅 listener。 - 不得在 `router.go` 空白导入 `custom_events` 触发注册。 -- 统一在 `internal/bootstrap` + `internal/cmd` 入口显式装配。 +- 统一在 `internal/platform/bootstrap` + `internal/cmd` 入口显式装配。 diff --git a/AGENTS.md b/AGENTS.md index a004073c..10f6a863 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -14,7 +14,7 @@ | `new-async-task` | 添加或修改 Asynq 任务、定时任务、TaskHandler、任务元数据 | | `new-setting` | 添加或修改系统/业务/公开设置、`/admin/system` 参数或 `/admin/settings` 图形化设置 | | `database-migration` | 数据库表结构变更、goose SQL 迁移（PG/SQLite/ClickHouse）、seed 数据 | -| `clickhouse-batchwriter` | ClickHouse 批量写入、`internal/db/batchwriter` 接入、分析表异步 flush、背压与写入路径改造 | +| `clickhouse-batchwriter` | ClickHouse 批量写入、`internal/infra/persistence/batchwriter` 接入、分析表异步 flush、背压与写入路径改造 | | `file-upload` | 业务上传文件、Worker 程序化摄取、`upload.Ingest` 策略选型、文件访问与 `w_uploads` / 统计排查 | | `cache-framework` | 新增或修改业务缓存（RAM/Redis/DB 三层读路径）、缓存失效、多节点 pub/sub 同步、评估高频读是否应接入缓存 | | `push-notification` | 系统通知推送事件、统一触发器投递、带消息推送的业务功能 | @@ -28,8 +28,8 @@ - 测试用例禁止硬编码相对路径创建临时目录，统一使用 Go 内置 `t.TempDir()`。 - 所有 HTTP 路由仅在 `internal/router/router.go` 中作为高层分发注册。 - 修改 API Handler 后运行 `make swagger`，完成代码开发后必须依次运行 `make code-check` 与 `make format`。 -- 业务模块必须复用平台缓存/文件服务：文件摄取统一用 `upload.Ingest`，删除用 `upload.Remove`/`upload.RemoveOwned`；禁止直接写 `w_uploads` 或操作底层 storage。 -- 禁止在 `init()` 中注册跨模块集成（任务 Handler、推送事件、域事件监听器等），统一在 `internal/bootstrap` 显式装配并在 `internal/cmd` 入口调用。 +- 业务模块必须复用平台缓存/文件服务：文件摄取统一用 `upload.Ingest`，删除用 `upload.Remove`/`upload.RemoveOwned`；禁止直接写 `w_uploads` 或绕过 upload 域直接操作 `infra/objectstore`。 +- 禁止在 `init()` 中注册跨模块集成（任务 Handler、推送事件、域事件监听器等），统一在 `internal/platform/bootstrap` 显式装配并在 `internal/cmd` 入口调用。 - 核心业务模块（`oauth`、`user`）禁止直接 import `push` 或 `custom_events` 触发通知，须通过 `internal/listener` 发射域事件。 - API 错误响应必须通过 `response.Abort*` 中断请求，由 `ErrorHandlerMiddleware` 统一写出 JSON 并记录 Trace；禁止在 Handler/中间件中直接 `c.JSON(status, response.Err(...))` 或 `200` 返回 `error_msg`。 @@ -53,23 +53,28 @@ ### 后端目录 (`internal/`) - `internal/cmd/`：Cobra CLI 命令入口（API/Worker/Scheduler）。 -- `internal/bootstrap/`：应用装配根，集中注册 Task、推送订阅、域事件监听器及进程级初始化。 -- `internal/config/`：Viper 配置加载与映射结构体。 +- `internal/platform/`：进程与跨模块装配。 + - `bootstrap/`：应用装配根，集中注册 Task、推送订阅、域事件监听器及进程级初始化。 + - `lifecycle/`：进程 shutdown hook。 +- `internal/infra/`：接入外部世界与 Wavelet 运行时配置的实现（非业务用例）。 + - `config/`：Viper 启动配置加载与映射结构体。 + - `persistence/`：PostgreSQL/Redis/ClickHouse 连接池、goose 迁移（`migrator/goose/`）、batchwriter、idgen（Go 包名仍为 `db`）。 + - `objectstore/`：对象存储多后端适配（Local/S3/R2/OSS/WebDAV；原 `internal/storage`）。 + - `diskcache/`：读 system_config 的磁盘缓存包装（引擎在 `pkg/cache/disk`）。 + - `task/`：Asynq 运行时、worker/scheduler、任务元数据。 +- `internal/shared/`：跨层无 IO 约定（`response` envelope、通用错误文案等）。 - `internal/router/`：全局唯一 HTTP 路由注册点。 - `internal/apps/`：按功能（Feature-based）划分模块的 Handler 与业务逻辑（管理端位于 `admin/`）。 - `internal/apps/upload/`：文件上传服务、访问控制与 WebP 压缩。 - `internal/model/`：GORM 数据模型定义与模型层方法。 -- `internal/db/`：PostgreSQL/Redis/ClickHouse 连接池与 goose SQL 迁移文件（`db/migrator/goose/`）。 -- `internal/diskcache/`：平台级磁盘字节缓存（`diskcache.GetGlobalCache()`）。 -- `internal/storage/`：S3 对象存储适配器。 -- `internal/task/`：Asynq 异步任务定义。 -- `internal/common/`：全局共享模型、统一响应（`response`）、绑定助手与通用错误。 +- `internal/repository/`：数据访问（过渡期包级函数；后续接口化）。 - `internal/util/`：纯底层无框架依赖工具函数。 -- `internal/listener/`：域事件分发层（解耦业务域与运维/推送模块）。 -- `internal/otel_trace/`：OpenTelemetry 链路追踪助手。 +- `internal/listener/`：域事件分发层（解耦业务域与运维/推送模块；过渡）。 - `internal/testhelper/`：后端测试共享 Helper。 - `internal/buildinfo/`：编译与构建元数据。 +新增技术能力默认放进 `infra/` 或 `platform/` 子树，禁止再在 `internal/` 顶层平铺杂散包。 + ### 公共底层包 (`pkg/`) - `pkg/cache/disk/`：纯底层磁盘缓存引擎。 - `pkg/cap/`：通用验证码库。 @@ -94,14 +99,14 @@ ### API 响应规范 - **统一信封**：`{ "error_msg": "", "data": ... }` - **成功**：HTTP 200，写出 `c.JSON(http.StatusOK, response.OK(data))` 或 `response.OKNil()`。 -- **失败**：使用 `internal/common/response` 的 `Abort*` 系列函数（如 `AbortBadRequest`、`AbortUnauthorized`、`AbortNotFound`、`AbortInternal`）中断请求。 +- **失败**：使用 `internal/shared/response` 的 `Abort*` 系列函数（如 `AbortBadRequest`、`AbortUnauthorized`、`AbortNotFound`、`AbortInternal`）中断请求。 - **错误文案**：使用模块内 `errs.go` 中的 camelCase 字符串常量（如 `errBindParamsFailed`），禁止暴露底层数据库/系统错误细节给客户端。 - **Logics 分工**：`logics.go` 只接受 `context.Context`，返回 `(result, error)`，严禁依赖 `*gin.Context` 或调用 `c.JSON`/`Abort*`。 - **错误日志**：底层错误在 Handler/Logic 边界用 `pkg/logger` 打印日志，禁止使用 `_ = ...` 静默吞掉关键错误。 ### 数据库操作 -- 管理员代码推荐使用 `db.DB(ctx)` 保证 Trace 链路透传。 -- 禁止在 Handler 写复杂 SQL；迁移文件位于 `internal/db/migrator/goose/`（禁止 GORM AutoMigrate）。 +- 管理员代码推荐使用 `db.DB(ctx)`（`internal/infra/persistence`，包名 `db`）保证 Trace 链路透传。 +- 禁止在 Handler 写复杂 SQL；迁移文件位于 `internal/infra/persistence/migrator/goose/`（禁止 GORM AutoMigrate）。 - 不创建物理外键（显式建索引）；Go 模型零值需与数据库默认值匹配。 ## 前端开发规范 diff --git a/docs/PERFORMANCE.md b/docs/PERFORMANCE.md index 2af8d141..ce1c45b8 100644 --- a/docs/PERFORMANCE.md +++ b/docs/PERFORMANCE.md @@ -209,7 +209,7 @@ err = db.DB(ctx).Model(&model.Upload{}). ### 4. `w_uploads` 索引缺口 `✅ 已完成` -**涉及文件**：`internal/db/migrator/goose/postgres/202606090001_initial_schema.sql` +**涉及文件**：`internal/infra/persistence/migrator/goose/postgres/202606090001_initial_schema.sql` **当前索引**：`user_id`, `file_path`, `hash`, `type` @@ -341,7 +341,7 @@ if (loading || !user) { | 17 | ~~Users 表每行嵌套 3 个 `TooltipProvider`~~ ✅ | `admin/users/page.tsx` | 表格外层单一 Provider | | 18 | ~~缩略图用原生 `` 无 lazy loading~~ ✅ | `file-list.tsx`, `file-manager.tsx` | `loading="lazy"` + `decoding="async"` | | 19 | ~~`@/lib/services` barrel 导入~~ ✅ | 全前端消费侧 | 改为 `@/lib/services/` 直接导入 | -| 20 | SQLite 模式无连接池调优 | `internal/db/postgres.go` | 默认 SQLite 写锁瓶颈 | +| 20 | SQLite 模式无连接池调优 | `internal/infra/persistence/postgres.go` | 默认 SQLite 写锁瓶颈 | | 21 | Session Redis 仅用第一个地址 | `internal/router/router.go` | Sentinel/Cluster 场景不一致 | --- @@ -397,11 +397,11 @@ if (loading || !user) { |---|------|------| | 1 | 系统配置两层缓存 RAM → DB | `pkg/cache/store`, `system_config_cache.go`, `GetByKey` | | 2 | 系统配置统一刷新 + 多节点 pub/sub 预热广播 | `InvalidateSystemConfigCache`, `InvalidateAllSystemConfigCaches` | -| 3 | Storage Backend 单例 + 5s TTL + pub/sub 失效 | `internal/storage/storage.go` — `Active()` | +| 3 | Storage Backend 单例 + 5s TTL + pub/sub 失效 | `internal/infra/objectstore/storage.go` — `Active()` | | 4 | 推送事件/渠道 24h Redis 缓存 + GORM hook 失效 | `internal/model/push_event.go`, `push_channel.go` | | 5 | 风控日志异步批写 ClickHouse（1 万缓冲 + 1000 条/1s + 429 背压） | `internal/apps/risk_control/` | | 6 | HTTP 连接池统一（`httppool` + OTel） | `pkg/httppool/` | -| 7 | DB/Redis 连接池显式配置 | `config.yaml`, `internal/db/` | +| 7 | DB/Redis 连接池显式配置 | `config.yaml`, `internal/infra/persistence/` | | 8 | 游标分批处理（`id > ? LIMIT n`） | `cleanup.go`, image warmup | | 9 | 存储迁移并发上限 `errgroup.SetLimit(10)` | `storage_migration_task.go` | | 10 | 邮件/推送走 Asynq，不在 HTTP 路径同步发送 | `user/logics.go`, `push/events.go` | @@ -410,7 +410,7 @@ if (loading || !user) { | 13 | 前端 API 请求去重（`pendingRequests` Map） | `frontend/lib/services/core/api-client.ts` | | 14 | React Query 全局 30s `staleTime` | `frontend/components/providers/query-provider.tsx` | | 15 | React Compiler 已启用 | `frontend/next.config.ts` | -| 16 | 读副本支持（`dbresolver`） | `internal/db/postgres.go` | +| 16 | 读副本支持（`dbresolver`） | `internal/infra/persistence/postgres.go` | | 17 | 任务执行日志 Redis 缓冲 + 批量回写 | `internal/model/task_execution.go` | | 18 | 公共配置列表 Redis 缓存 + 写后失效 | `ListVisibleSystemConfigs`, `InvalidateVisibleSystemConfigsCache` | | 19 | 上传文件统计增量表 `w_upload_stats` | `stats_counter.go`, 上传/删除 hook | @@ -493,7 +493,7 @@ P1 | 参数失效 API | `InvalidateSystemConfigCache` | ✅ 清 RAM + Redis field | | CAPTCHA 快照 | `internal/apps/cap/runtime_settings.go` | ✅ `CurrentSettings` + pub/sub | | 批量下载 | `internal/apps/upload/routers.go` | 同步 ZIP | -| 上传索引 | `internal/db/migrator/goose/*202606170001*.sql` | ✅ 复合索引已加 | +| 上传索引 | `internal/infra/persistence/migrator/goose/*202606170001*.sql` | ✅ 复合索引已加 | | 认证 gate | `frontend/app/(main)/layout.tsx` | ✅ 即时渲染 + `useAuthRedirect` | | 页面鉴权 | `frontend/components/auth/require-auth.tsx` | ✅ 子页面按需拦截 | | 用户上下文 | `frontend/contexts/user-context.tsx` | ✅ 登录/注册页跳过 fetch | diff --git a/internal/apps/admin/auth_source/routers.go b/internal/apps/admin/auth_source/routers.go index fc0339ba..0366af08 100644 --- a/internal/apps/admin/auth_source/routers.go +++ b/internal/apps/admin/auth_source/routers.go @@ -16,7 +16,7 @@ import ( "github.com/Rain-kl/Wavelet/internal/repository" "github.com/gin-gonic/gin" - "github.com/Rain-kl/Wavelet/internal/common/response" + "github.com/Rain-kl/Wavelet/internal/shared/response" ) // AuthSourceRequest 创建或更新认证源的请求参数 diff --git a/internal/apps/admin/auth_source/routers_test.go b/internal/apps/admin/auth_source/routers_test.go index bd7e2489..3d05bf49 100644 --- a/internal/apps/admin/auth_source/routers_test.go +++ b/internal/apps/admin/auth_source/routers_test.go @@ -16,7 +16,7 @@ import ( "github.com/Rain-kl/Wavelet/internal/testhelper" "github.com/gin-gonic/gin" - "github.com/Rain-kl/Wavelet/internal/common/response" + "github.com/Rain-kl/Wavelet/internal/shared/response" ) func setupTestRouter(authUser *model.User) *gin.Engine { diff --git a/internal/apps/admin/cache/routers.go b/internal/apps/admin/cache/routers.go index 12003c26..b9b1c799 100644 --- a/internal/apps/admin/cache/routers.go +++ b/internal/apps/admin/cache/routers.go @@ -8,11 +8,11 @@ import ( "net/http" "strconv" - "github.com/Rain-kl/Wavelet/internal/diskcache" + "github.com/Rain-kl/Wavelet/internal/infra/diskcache" "github.com/Rain-kl/Wavelet/internal/model" "github.com/gin-gonic/gin" - "github.com/Rain-kl/Wavelet/internal/common/response" + "github.com/Rain-kl/Wavelet/internal/shared/response" ) type updateCacheConfigRequest struct { diff --git a/internal/apps/admin/db_manage/routers.go b/internal/apps/admin/db_manage/routers.go index e2a1fbc0..972c32db 100644 --- a/internal/apps/admin/db_manage/routers.go +++ b/internal/apps/admin/db_manage/routers.go @@ -15,12 +15,12 @@ import ( "strings" "time" - "github.com/Rain-kl/Wavelet/internal/config" - "github.com/Rain-kl/Wavelet/internal/db" + "github.com/Rain-kl/Wavelet/internal/infra/config" + "github.com/Rain-kl/Wavelet/internal/infra/persistence" "github.com/gin-gonic/gin" "gorm.io/gorm" - "github.com/Rain-kl/Wavelet/internal/common/response" + "github.com/Rain-kl/Wavelet/internal/shared/response" ) const ( diff --git a/internal/apps/admin/logs/routers.go b/internal/apps/admin/logs/routers.go index a29be1eb..85b637a8 100644 --- a/internal/apps/admin/logs/routers.go +++ b/internal/apps/admin/logs/routers.go @@ -14,14 +14,14 @@ import ( "time" "github.com/Rain-kl/Wavelet/internal/apps/admin" - "github.com/Rain-kl/Wavelet/internal/config" - "github.com/Rain-kl/Wavelet/internal/db" + "github.com/Rain-kl/Wavelet/internal/infra/config" + "github.com/Rain-kl/Wavelet/internal/infra/persistence" "github.com/Rain-kl/Wavelet/internal/model" analyticsrepo "github.com/Rain-kl/Wavelet/internal/repository/analytics" "github.com/Rain-kl/Wavelet/pkg/logger" "github.com/gin-gonic/gin" - "github.com/Rain-kl/Wavelet/internal/common/response" + "github.com/Rain-kl/Wavelet/internal/shared/response" ) const ( diff --git a/internal/apps/admin/logs/utils_test.go b/internal/apps/admin/logs/utils_test.go index 2d99129a..3768e2eb 100644 --- a/internal/apps/admin/logs/utils_test.go +++ b/internal/apps/admin/logs/utils_test.go @@ -11,7 +11,7 @@ import ( "gorm.io/driver/sqlite" "gorm.io/gorm" - "github.com/Rain-kl/Wavelet/internal/db" + "github.com/Rain-kl/Wavelet/internal/infra/persistence" "github.com/Rain-kl/Wavelet/internal/model" ) diff --git a/internal/apps/admin/middlewares.go b/internal/apps/admin/middlewares.go index 61fc86bf..c40215cb 100644 --- a/internal/apps/admin/middlewares.go +++ b/internal/apps/admin/middlewares.go @@ -5,8 +5,8 @@ package admin import ( - "github.com/Rain-kl/Wavelet/internal/common/response" "github.com/Rain-kl/Wavelet/internal/model" + "github.com/Rain-kl/Wavelet/internal/shared/response" "github.com/Rain-kl/Wavelet/pkg/logger" otel_trace "github.com/Rain-kl/Wavelet/pkg/trace" diff --git a/internal/apps/admin/push/channels.go b/internal/apps/admin/push/channels.go index 6a21577d..0b205734 100644 --- a/internal/apps/admin/push/channels.go +++ b/internal/apps/admin/push/channels.go @@ -14,8 +14,8 @@ import ( "github.com/gin-gonic/gin" "gorm.io/gorm" - "github.com/Rain-kl/Wavelet/internal/common/response" "github.com/Rain-kl/Wavelet/internal/model" + "github.com/Rain-kl/Wavelet/internal/shared/response" ) // ListChannelDefinitions 获取各种消息通道的表单配置定义列表 diff --git a/internal/apps/admin/push/custom_events/admin_login_test.go b/internal/apps/admin/push/custom_events/admin_login_test.go index bc31b35e..45d6d9c2 100644 --- a/internal/apps/admin/push/custom_events/admin_login_test.go +++ b/internal/apps/admin/push/custom_events/admin_login_test.go @@ -11,10 +11,10 @@ import ( "time" "github.com/Rain-kl/Wavelet/internal/apps/admin/push" + "github.com/Rain-kl/Wavelet/internal/infra/task" "github.com/Rain-kl/Wavelet/internal/listener" "github.com/Rain-kl/Wavelet/internal/model" "github.com/Rain-kl/Wavelet/internal/repository" - "github.com/Rain-kl/Wavelet/internal/task" "github.com/Rain-kl/Wavelet/internal/testhelper" "github.com/hibiken/asynq" "github.com/stretchr/testify/assert" diff --git a/internal/apps/admin/push/events.go b/internal/apps/admin/push/events.go index 7b896279..6cc26bc2 100644 --- a/internal/apps/admin/push/events.go +++ b/internal/apps/admin/push/events.go @@ -11,9 +11,9 @@ import ( "fmt" "strings" + "github.com/Rain-kl/Wavelet/internal/infra/task" "github.com/Rain-kl/Wavelet/internal/model" "github.com/Rain-kl/Wavelet/internal/repository" - "github.com/Rain-kl/Wavelet/internal/task" "github.com/Rain-kl/Wavelet/pkg/logger" pkgpush "github.com/Rain-kl/Wavelet/pkg/push" "gorm.io/gorm" diff --git a/internal/apps/admin/push/logics.go b/internal/apps/admin/push/logics.go index 0425c1a9..713797e9 100644 --- a/internal/apps/admin/push/logics.go +++ b/internal/apps/admin/push/logics.go @@ -10,9 +10,9 @@ import ( "strconv" "strings" + "github.com/Rain-kl/Wavelet/internal/infra/task" "github.com/Rain-kl/Wavelet/internal/model" "github.com/Rain-kl/Wavelet/internal/repository" - "github.com/Rain-kl/Wavelet/internal/task" pkgpush "github.com/Rain-kl/Wavelet/pkg/push" "gorm.io/gorm" ) diff --git a/internal/apps/admin/push/push_test.go b/internal/apps/admin/push/push_test.go index a0ff2d5e..83f3688e 100644 --- a/internal/apps/admin/push/push_test.go +++ b/internal/apps/admin/push/push_test.go @@ -15,10 +15,10 @@ import ( "time" "github.com/Rain-kl/Wavelet/internal/apps/oauth" - "github.com/Rain-kl/Wavelet/internal/common/response" + "github.com/Rain-kl/Wavelet/internal/infra/task" "github.com/Rain-kl/Wavelet/internal/model" "github.com/Rain-kl/Wavelet/internal/repository" - "github.com/Rain-kl/Wavelet/internal/task" + "github.com/Rain-kl/Wavelet/internal/shared/response" "github.com/Rain-kl/Wavelet/internal/testhelper" pkgpush "github.com/Rain-kl/Wavelet/pkg/push" "github.com/alicebob/miniredis/v2" diff --git a/internal/apps/admin/push/routers.go b/internal/apps/admin/push/routers.go index b03f37c6..d7e0df0f 100644 --- a/internal/apps/admin/push/routers.go +++ b/internal/apps/admin/push/routers.go @@ -17,7 +17,7 @@ import ( "github.com/gin-gonic/gin" "gorm.io/gorm" - "github.com/Rain-kl/Wavelet/internal/common/response" + "github.com/Rain-kl/Wavelet/internal/shared/response" ) // UpdateEventRequest 更新事件请求参数 diff --git a/internal/apps/admin/push/task_listener.go b/internal/apps/admin/push/task_listener.go index 9736c317..ec119710 100644 --- a/internal/apps/admin/push/task_listener.go +++ b/internal/apps/admin/push/task_listener.go @@ -9,8 +9,8 @@ import ( "strconv" "time" + "github.com/Rain-kl/Wavelet/internal/infra/task" "github.com/Rain-kl/Wavelet/internal/model" - "github.com/Rain-kl/Wavelet/internal/task" "github.com/Rain-kl/Wavelet/pkg/logger" ) diff --git a/internal/apps/admin/push/tasks.go b/internal/apps/admin/push/tasks.go index 235bf673..2d4ad7ca 100644 --- a/internal/apps/admin/push/tasks.go +++ b/internal/apps/admin/push/tasks.go @@ -10,7 +10,7 @@ import ( "errors" "fmt" - "github.com/Rain-kl/Wavelet/internal/task" + "github.com/Rain-kl/Wavelet/internal/infra/task" "github.com/Rain-kl/Wavelet/pkg/push" ) diff --git a/internal/apps/admin/status/routers.go b/internal/apps/admin/status/routers.go index 29a1f23f..30a0c5c5 100644 --- a/internal/apps/admin/status/routers.go +++ b/internal/apps/admin/status/routers.go @@ -16,11 +16,11 @@ import ( "runtime" "time" - "github.com/Rain-kl/Wavelet/internal/config" - "github.com/Rain-kl/Wavelet/internal/db" + "github.com/Rain-kl/Wavelet/internal/infra/config" + "github.com/Rain-kl/Wavelet/internal/infra/persistence" "github.com/gin-gonic/gin" - "github.com/Rain-kl/Wavelet/internal/common/response" + "github.com/Rain-kl/Wavelet/internal/shared/response" ) // startTime 记录服务启动时间 diff --git a/internal/apps/admin/system_config/logics.go b/internal/apps/admin/system_config/logics.go index d161e894..008eafc6 100644 --- a/internal/apps/admin/system_config/logics.go +++ b/internal/apps/admin/system_config/logics.go @@ -9,10 +9,10 @@ import ( "errors" "time" - "github.com/Rain-kl/Wavelet/internal/db" + "github.com/Rain-kl/Wavelet/internal/infra/objectstore" + "github.com/Rain-kl/Wavelet/internal/infra/persistence" "github.com/Rain-kl/Wavelet/internal/model" "github.com/Rain-kl/Wavelet/internal/repository" - "github.com/Rain-kl/Wavelet/internal/storage" "github.com/Rain-kl/Wavelet/pkg/logger" "gorm.io/gorm" ) @@ -58,9 +58,9 @@ func updateSystemConfig(ctx context.Context, key string, req UpdateSystemConfigR return err } - var originalDriver storage.Driver + var originalDriver objectstore.Driver if key == model.ConfigKeyStorageConfig { - var currentCfg storage.Config + var currentCfg objectstore.Config if err := json.Unmarshal([]byte(config.Value), ¤tCfg); err == nil { originalDriver = currentCfg.Driver } @@ -101,14 +101,14 @@ func resolveStorageMigrationTasksOnDirectDriverUpdate( ctx context.Context, tx *gorm.DB, key string, - originalDriver storage.Driver, + originalDriver objectstore.Driver, newValue string, ) { if key != model.ConfigKeyStorageConfig || originalDriver == "" { return } - var newCfg storage.Config + var newCfg objectstore.Config if err := json.Unmarshal([]byte(newValue), &newCfg); err != nil { return } diff --git a/internal/apps/admin/system_config/routers.go b/internal/apps/admin/system_config/routers.go index 336faa47..d1a73218 100644 --- a/internal/apps/admin/system_config/routers.go +++ b/internal/apps/admin/system_config/routers.go @@ -17,11 +17,11 @@ import ( "github.com/Rain-kl/Wavelet/internal/apps/cap" "github.com/Rain-kl/Wavelet/internal/apps/upload" - "github.com/Rain-kl/Wavelet/internal/common/response" - "github.com/Rain-kl/Wavelet/internal/db" + "github.com/Rain-kl/Wavelet/internal/infra/objectstore" + "github.com/Rain-kl/Wavelet/internal/infra/persistence" "github.com/Rain-kl/Wavelet/internal/model" "github.com/Rain-kl/Wavelet/internal/repository" - "github.com/Rain-kl/Wavelet/internal/storage" + "github.com/Rain-kl/Wavelet/internal/shared/response" "github.com/Rain-kl/Wavelet/pkg/logger" mail "github.com/Rain-kl/Wavelet/pkg/mail" ) @@ -187,8 +187,8 @@ func invalidateCachesAfterConfigUpdate(ctx context.Context, key string) { if key == model.ConfigKeyStorageConfig { upload.ResetAccessCaches() upload.PublishAccessCacheInvalidation(ctx) - storage.ResetCache() - storage.PublishCacheInvalidation(ctx) + objectstore.ResetCache() + objectstore.PublishCacheInvalidation(ctx) } if key == model.ConfigKeyFileAccessWhitelist { upload.ResetAccessCaches() @@ -284,9 +284,9 @@ func maskSensitiveConfig(key, value string) string { case model.ConfigKeySMTPPassword: return maskedConfigValue case model.ConfigKeyStorageConfig: - var cfg storage.Config + var cfg objectstore.Config if err := json.Unmarshal([]byte(value), &cfg); err == nil { - masked := storage.MaskSecrets(cfg) + masked := objectstore.MaskSecrets(cfg) if val, err := json.Marshal(masked); err == nil { return string(val) } @@ -298,18 +298,18 @@ func maskSensitiveConfig(key, value string) string { // validateAndMergeStorageConfig parses, merges unmasked secrets, validates parameter values, // and tests connectivity of the new storage configuration. func validateAndMergeStorageConfig(ctx context.Context, value string, currentConfig string) (string, error) { - var currentCfg storage.Config + var currentCfg objectstore.Config if err := json.Unmarshal([]byte(currentConfig), ¤tCfg); err != nil { return "", fmt.Errorf("解析当前存储配置失败: %w", err) } - var newCfg storage.Config + var newCfg objectstore.Config if err := json.Unmarshal([]byte(value), &newCfg); err != nil { return "", fmt.Errorf("解析目标存储配置失败: %w", err) } // 合并被掩码屏蔽的敏感信息，获取完整的真实配置 - targetCfg := storage.MergeMaskedSecrets(newCfg, currentCfg) + targetCfg := objectstore.MergeMaskedSecrets(newCfg, currentCfg) if err := validateMergedStorageConfig(ctx, currentCfg, newCfg, targetCfg); err != nil { return "", err } @@ -323,7 +323,7 @@ func validateAndMergeStorageConfig(ctx context.Context, value string, currentCon return string(unmaskedVal), nil } -func validateMergedStorageConfig(ctx context.Context, currentCfg, newCfg, targetCfg storage.Config) error { +func validateMergedStorageConfig(ctx context.Context, currentCfg, newCfg, targetCfg objectstore.Config) error { if newCfg.Driver != "" && newCfg.Driver != currentCfg.Driver { var uploadCount int64 if err := db.DB(ctx).Model(&model.Upload{}). @@ -342,19 +342,19 @@ func validateMergedStorageConfig(ctx context.Context, currentCfg, newCfg, target return testStorageBackend(ctx, pendingCfg, newCfg.Driver) } - if err := storage.ValidateConfig(targetCfg); err != nil { + if err := objectstore.ValidateConfig(targetCfg); err != nil { return fmt.Errorf("验证存储配置参数失败: %w", err) } return testStorageBackend(ctx, targetCfg, targetCfg.Driver) } -func validateDriverConfig(cfg storage.Config, driver storage.Driver) error { +func validateDriverConfig(cfg objectstore.Config, driver objectstore.Driver) error { cfg.Driver = driver - return storage.ValidateConfig(cfg) + return objectstore.ValidateConfig(cfg) } -func testStorageBackend(ctx context.Context, cfg storage.Config, driver storage.Driver) error { - testBackend, err := storage.NewBackend(ctx, cfg, driver) +func testStorageBackend(ctx context.Context, cfg objectstore.Config, driver objectstore.Driver) error { + testBackend, err := objectstore.NewBackend(ctx, cfg, driver) if err != nil { return fmt.Errorf("初始化测试存储实例失败: %w", err) } diff --git a/internal/apps/admin/system_config/routers_test.go b/internal/apps/admin/system_config/routers_test.go index f268faa8..a32be2de 100644 --- a/internal/apps/admin/system_config/routers_test.go +++ b/internal/apps/admin/system_config/routers_test.go @@ -17,14 +17,14 @@ import ( "testing" "github.com/Rain-kl/Wavelet/internal/apps/oauth" - "github.com/Rain-kl/Wavelet/internal/db" + "github.com/Rain-kl/Wavelet/internal/infra/objectstore" + "github.com/Rain-kl/Wavelet/internal/infra/persistence" "github.com/Rain-kl/Wavelet/internal/model" "github.com/Rain-kl/Wavelet/internal/repository" - "github.com/Rain-kl/Wavelet/internal/storage" "github.com/Rain-kl/Wavelet/internal/testhelper" "github.com/gin-gonic/gin" - "github.com/Rain-kl/Wavelet/internal/common/response" + "github.com/Rain-kl/Wavelet/internal/shared/response" ) const expectedDefaultConfigsCount = 30 @@ -394,7 +394,7 @@ func TestUpdateStorageConfigValidation(t *testing.T) { t.Run("update storage config successfully", func(t *testing.T) { tempDir := t.TempDir() - cfg := storage.DefaultConfig() + cfg := objectstore.DefaultConfig() cfg.Local.Root = tempDir cfgBytes, _ := json.Marshal(cfg) @@ -414,7 +414,7 @@ func TestUpdateStorageConfigValidation(t *testing.T) { // Verify database var dbCfg model.SystemConfig dbConn.Where("key = ?", "storage_config").First(&dbCfg) - var savedCfg storage.Config + var savedCfg objectstore.Config _ = json.Unmarshal([]byte(dbCfg.Value), &savedCfg) if savedCfg.Local.Root != tempDir { t.Errorf("expected local root to be updated to %s, got %s", tempDir, savedCfg.Local.Root) @@ -422,8 +422,8 @@ func TestUpdateStorageConfigValidation(t *testing.T) { }) t.Run("update storage config failed connectivity check", func(t *testing.T) { - cfg := storage.DefaultConfig() - cfg.Driver = storage.DriverS3 + cfg := objectstore.DefaultConfig() + cfg.Driver = objectstore.DriverS3 cfg.S3.Bucket = "non-existent-bucket" cfg.S3.Endpoint = "http://127.0.0.1:9999" // Will fail connectivity check @@ -459,8 +459,8 @@ func TestUpdateStorageConfigValidation(t *testing.T) { } tempDir := t.TempDir() - cfg := storage.DefaultConfig() - cfg.Driver = storage.DriverS3 + cfg := objectstore.DefaultConfig() + cfg.Driver = objectstore.DriverS3 cfg.S3.Endpoint = "http://127.0.0.1:19998" cfg.S3.Region = "us-east-1" cfg.S3.Bucket = "wavelet" @@ -489,8 +489,8 @@ func TestUpdateStorageConfigValidation(t *testing.T) { t.Fatalf("clear uploads failed: %v", err) } - activeCfg := storage.DefaultConfig() - activeCfg.Driver = storage.DriverS3 + activeCfg := objectstore.DefaultConfig() + activeCfg.Driver = objectstore.DriverS3 activeCfg.S3.Endpoint = "http://127.0.0.1:9999" activeCfg.S3.Region = "us-east-1" activeCfg.S3.Bucket = "wavelet" @@ -510,7 +510,7 @@ func TestUpdateStorageConfigValidation(t *testing.T) { tempDir := t.TempDir() stagedCfg := activeCfg - stagedCfg.Driver = storage.DriverLocal + stagedCfg.Driver = objectstore.DriverLocal stagedCfg.Local.Root = tempDir cfgBytes, _ := json.Marshal(stagedCfg) @@ -529,12 +529,12 @@ func TestUpdateStorageConfigValidation(t *testing.T) { if err := dbConn.Where("key = ?", "storage_config").First(&dbCfg).Error; err != nil { t.Fatalf("load saved storage config failed: %v", err) } - var savedCfg storage.Config + var savedCfg objectstore.Config if err := json.Unmarshal([]byte(dbCfg.Value), &savedCfg); err != nil { t.Fatalf("parse saved storage config failed: %v", err) } - if savedCfg.Driver != storage.DriverLocal { - t.Fatalf("active driver = %q, want %q after save", savedCfg.Driver, storage.DriverLocal) + if savedCfg.Driver != objectstore.DriverLocal { + t.Fatalf("active driver = %q, want %q after save", savedCfg.Driver, objectstore.DriverLocal) } if savedCfg.Local.Root != tempDir { t.Fatalf("staged local root = %q, want %q", savedCfg.Local.Root, tempDir) diff --git a/internal/apps/admin/task/routers.go b/internal/apps/admin/task/routers.go index ed969a7d..b3e8afc9 100644 --- a/internal/apps/admin/task/routers.go +++ b/internal/apps/admin/task/routers.go @@ -12,14 +12,14 @@ import ( "time" "github.com/Rain-kl/Wavelet/internal/apps/admin" + "github.com/Rain-kl/Wavelet/internal/infra/task" + "github.com/Rain-kl/Wavelet/internal/infra/task/scheduler" "github.com/Rain-kl/Wavelet/internal/model" - "github.com/Rain-kl/Wavelet/internal/task" - "github.com/Rain-kl/Wavelet/internal/task/scheduler" "github.com/Rain-kl/Wavelet/pkg/logger" "github.com/gin-gonic/gin" "github.com/robfig/cron/v3" - "github.com/Rain-kl/Wavelet/internal/common/response" + "github.com/Rain-kl/Wavelet/internal/shared/response" ) // ListTaskTypes 获取支持的任务类型列表 diff --git a/internal/apps/admin/task/routers_test.go b/internal/apps/admin/task/routers_test.go index db63ab8b..100742d8 100644 --- a/internal/apps/admin/task/routers_test.go +++ b/internal/apps/admin/task/routers_test.go @@ -17,16 +17,16 @@ import ( "github.com/Rain-kl/Wavelet/internal/apps/oauth" uploadtask "github.com/Rain-kl/Wavelet/internal/apps/upload/task" "github.com/Rain-kl/Wavelet/internal/apps/user" - "github.com/Rain-kl/Wavelet/internal/bootstrap" + "github.com/Rain-kl/Wavelet/internal/infra/task" "github.com/Rain-kl/Wavelet/internal/model" - "github.com/Rain-kl/Wavelet/internal/task" + "github.com/Rain-kl/Wavelet/internal/platform/bootstrap" "github.com/Rain-kl/Wavelet/internal/testhelper" "github.com/gin-gonic/gin" "github.com/hibiken/asynq" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/Rain-kl/Wavelet/internal/common/response" + "github.com/Rain-kl/Wavelet/internal/shared/response" ) func setupTaskTestEnvironment(t *testing.T) func() { diff --git a/internal/apps/admin/template/routers.go b/internal/apps/admin/template/routers.go index 6a1e455f..d4958dd6 100644 --- a/internal/apps/admin/template/routers.go +++ b/internal/apps/admin/template/routers.go @@ -10,7 +10,7 @@ import ( "github.com/gin-gonic/gin" "gorm.io/gorm" - "github.com/Rain-kl/Wavelet/internal/common/response" + "github.com/Rain-kl/Wavelet/internal/shared/response" ) // CreateTemplateRequest 创建模板请求 diff --git a/internal/apps/admin/template/routers_test.go b/internal/apps/admin/template/routers_test.go index 4561ffb5..e615a8a5 100644 --- a/internal/apps/admin/template/routers_test.go +++ b/internal/apps/admin/template/routers_test.go @@ -15,7 +15,7 @@ import ( "github.com/Rain-kl/Wavelet/internal/testhelper" "github.com/gin-gonic/gin" - "github.com/Rain-kl/Wavelet/internal/common/response" + "github.com/Rain-kl/Wavelet/internal/shared/response" ) func setupTestRouter(authUser *model.User) *gin.Engine { diff --git a/internal/apps/admin/updater/routers.go b/internal/apps/admin/updater/routers.go index 0c4e7767..2439a10f 100644 --- a/internal/apps/admin/updater/routers.go +++ b/internal/apps/admin/updater/routers.go @@ -11,7 +11,7 @@ import ( "github.com/Rain-kl/Wavelet/pkg/logger" "github.com/gin-gonic/gin" - "github.com/Rain-kl/Wavelet/internal/common/response" + "github.com/Rain-kl/Wavelet/internal/shared/response" ) // GetUpdateStatus 获取应用更新状态 diff --git a/internal/apps/admin/user/logics.go b/internal/apps/admin/user/logics.go index 158a5b17..4bee1a8d 100644 --- a/internal/apps/admin/user/logics.go +++ b/internal/apps/admin/user/logics.go @@ -10,8 +10,8 @@ import ( "time" "github.com/Rain-kl/Wavelet/internal/apps/oauth" - "github.com/Rain-kl/Wavelet/internal/db" - "github.com/Rain-kl/Wavelet/internal/db/idgen" + "github.com/Rain-kl/Wavelet/internal/infra/persistence" + "github.com/Rain-kl/Wavelet/internal/infra/persistence/idgen" "github.com/Rain-kl/Wavelet/internal/model" "github.com/Rain-kl/Wavelet/internal/repository" ) diff --git a/internal/apps/admin/user/routers.go b/internal/apps/admin/user/routers.go index 24d41e49..c4009424 100644 --- a/internal/apps/admin/user/routers.go +++ b/internal/apps/admin/user/routers.go @@ -16,7 +16,7 @@ import ( "github.com/gin-gonic/gin" "gorm.io/gorm" - "github.com/Rain-kl/Wavelet/internal/common/response" + "github.com/Rain-kl/Wavelet/internal/shared/response" ) // minPasswordLength 密码最小长度 diff --git a/internal/apps/admin/user/routers_test.go b/internal/apps/admin/user/routers_test.go index 5fe5e290..91e8a880 100644 --- a/internal/apps/admin/user/routers_test.go +++ b/internal/apps/admin/user/routers_test.go @@ -17,7 +17,7 @@ import ( "github.com/Rain-kl/Wavelet/internal/testhelper" "github.com/gin-gonic/gin" - "github.com/Rain-kl/Wavelet/internal/common/response" + "github.com/Rain-kl/Wavelet/internal/shared/response" ) func setupTestRouter(authUser *model.User) *gin.Engine { diff --git a/internal/apps/cap/manager.go b/internal/apps/cap/manager.go index a9c40e01..da4575db 100644 --- a/internal/apps/cap/manager.go +++ b/internal/apps/cap/manager.go @@ -13,8 +13,8 @@ import ( "sync" "time" - "github.com/Rain-kl/Wavelet/internal/config" - "github.com/Rain-kl/Wavelet/internal/db" + "github.com/Rain-kl/Wavelet/internal/infra/config" + "github.com/Rain-kl/Wavelet/internal/infra/persistence" pkgcap "github.com/Rain-kl/Wavelet/pkg/cap" ) diff --git a/internal/apps/cap/middleware.go b/internal/apps/cap/middleware.go index c05d4d64..5b04cd9e 100644 --- a/internal/apps/cap/middleware.go +++ b/internal/apps/cap/middleware.go @@ -6,7 +6,7 @@ package cap import ( "github.com/gin-gonic/gin" - "github.com/Rain-kl/Wavelet/internal/common/response" + "github.com/Rain-kl/Wavelet/internal/shared/response" ) // VerifyMiddleware returns a Gin middleware that checks and consumes the X-Cap-Token header. diff --git a/internal/apps/cap/routers.go b/internal/apps/cap/routers.go index 3965e69a..056f5968 100644 --- a/internal/apps/cap/routers.go +++ b/internal/apps/cap/routers.go @@ -6,7 +6,7 @@ package cap import ( "net/http" - "github.com/Rain-kl/Wavelet/internal/common/response" + "github.com/Rain-kl/Wavelet/internal/shared/response" pkgcap "github.com/Rain-kl/Wavelet/pkg/cap" "github.com/Rain-kl/Wavelet/pkg/logger" "github.com/gin-gonic/gin" diff --git a/internal/apps/cap/routers_test.go b/internal/apps/cap/routers_test.go index 64cec8a5..de9fdd7d 100644 --- a/internal/apps/cap/routers_test.go +++ b/internal/apps/cap/routers_test.go @@ -13,9 +13,9 @@ import ( "github.com/gin-gonic/gin" - "github.com/Rain-kl/Wavelet/internal/common/response" "github.com/Rain-kl/Wavelet/internal/model" "github.com/Rain-kl/Wavelet/internal/repository" + "github.com/Rain-kl/Wavelet/internal/shared/response" "github.com/Rain-kl/Wavelet/internal/testhelper" pkgcap "github.com/Rain-kl/Wavelet/pkg/cap" ) diff --git a/internal/apps/cap/runtime_settings.go b/internal/apps/cap/runtime_settings.go index 55966dac..02b4ecc7 100644 --- a/internal/apps/cap/runtime_settings.go +++ b/internal/apps/cap/runtime_settings.go @@ -14,7 +14,7 @@ import ( "golang.org/x/sync/singleflight" - "github.com/Rain-kl/Wavelet/internal/db" + "github.com/Rain-kl/Wavelet/internal/infra/persistence" "github.com/Rain-kl/Wavelet/internal/model" "github.com/Rain-kl/Wavelet/internal/repository" ) diff --git a/internal/apps/cap/runtime_settings_test.go b/internal/apps/cap/runtime_settings_test.go index f04ca5ee..29f0177c 100644 --- a/internal/apps/cap/runtime_settings_test.go +++ b/internal/apps/cap/runtime_settings_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - "github.com/Rain-kl/Wavelet/internal/db" + "github.com/Rain-kl/Wavelet/internal/infra/persistence" "github.com/Rain-kl/Wavelet/internal/model" "github.com/Rain-kl/Wavelet/internal/repository" "github.com/Rain-kl/Wavelet/internal/testhelper" diff --git a/internal/apps/config/routers.go b/internal/apps/config/routers.go index 8664a549..031b0080 100644 --- a/internal/apps/config/routers.go +++ b/internal/apps/config/routers.go @@ -12,7 +12,7 @@ import ( "github.com/Rain-kl/Wavelet/internal/repository" "github.com/gin-gonic/gin" - "github.com/Rain-kl/Wavelet/internal/common/response" + "github.com/Rain-kl/Wavelet/internal/shared/response" ) // GetPublicConfig 获取公共配置 diff --git a/internal/apps/config/routers_test.go b/internal/apps/config/routers_test.go index 2a65d1e6..d05aaa25 100644 --- a/internal/apps/config/routers_test.go +++ b/internal/apps/config/routers_test.go @@ -14,7 +14,7 @@ import ( "github.com/Rain-kl/Wavelet/internal/testhelper" "github.com/gin-gonic/gin" - "github.com/Rain-kl/Wavelet/internal/common/response" + "github.com/Rain-kl/Wavelet/internal/shared/response" ) func TestGetPublicConfigUsesVisibility(t *testing.T) { diff --git a/internal/apps/config/system_config_cache_test.go b/internal/apps/config/system_config_cache_test.go index 77884b5a..16719620 100644 --- a/internal/apps/config/system_config_cache_test.go +++ b/internal/apps/config/system_config_cache_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - "github.com/Rain-kl/Wavelet/internal/db" + "github.com/Rain-kl/Wavelet/internal/infra/persistence" "github.com/Rain-kl/Wavelet/internal/model" "github.com/Rain-kl/Wavelet/internal/repository" "github.com/Rain-kl/Wavelet/internal/testhelper" diff --git a/internal/apps/custom/routers.go b/internal/apps/custom/routers.go index 4381e842..e33c0839 100644 --- a/internal/apps/custom/routers.go +++ b/internal/apps/custom/routers.go @@ -10,7 +10,7 @@ import ( "github.com/gin-gonic/gin" - "github.com/Rain-kl/Wavelet/internal/common/response" + "github.com/Rain-kl/Wavelet/internal/shared/response" ) // Hello is a sample handler only — do not grow real product logic in this package. diff --git a/internal/apps/health/routers.go b/internal/apps/health/routers.go index 1559688f..d0d26bab 100644 --- a/internal/apps/health/routers.go +++ b/internal/apps/health/routers.go @@ -10,7 +10,7 @@ import ( "github.com/gin-gonic/gin" - "github.com/Rain-kl/Wavelet/internal/common/response" + "github.com/Rain-kl/Wavelet/internal/shared/response" ) // Health 健康检查 diff --git a/internal/apps/oauth/cache.go b/internal/apps/oauth/cache.go index f16210ed..5c70e294 100644 --- a/internal/apps/oauth/cache.go +++ b/internal/apps/oauth/cache.go @@ -10,7 +10,7 @@ import ( "sync" "time" - "github.com/Rain-kl/Wavelet/internal/db" + "github.com/Rain-kl/Wavelet/internal/infra/persistence" "github.com/Rain-kl/Wavelet/internal/model" "github.com/Rain-kl/Wavelet/pkg/cache/ram" ) diff --git a/internal/apps/oauth/cache_test.go b/internal/apps/oauth/cache_test.go index 2a90ad16..966cb5e9 100644 --- a/internal/apps/oauth/cache_test.go +++ b/internal/apps/oauth/cache_test.go @@ -12,7 +12,7 @@ import ( "github.com/redis/go-redis/v9" "github.com/redis/go-redis/v9/maintnotifications" - "github.com/Rain-kl/Wavelet/internal/db" + "github.com/Rain-kl/Wavelet/internal/infra/persistence" "github.com/Rain-kl/Wavelet/internal/model" ) diff --git a/internal/apps/oauth/handler_authorize.go b/internal/apps/oauth/handler_authorize.go index 6277f6c2..70d22c31 100644 --- a/internal/apps/oauth/handler_authorize.go +++ b/internal/apps/oauth/handler_authorize.go @@ -9,10 +9,10 @@ import ( "net/http" "strings" - "github.com/Rain-kl/Wavelet/internal/common" - "github.com/Rain-kl/Wavelet/internal/common/response" - "github.com/Rain-kl/Wavelet/internal/db" + "github.com/Rain-kl/Wavelet/internal/infra/persistence" "github.com/Rain-kl/Wavelet/internal/model" + "github.com/Rain-kl/Wavelet/internal/shared" + "github.com/Rain-kl/Wavelet/internal/shared/response" "github.com/coreos/go-oidc/v3/oidc" "github.com/gin-contrib/sessions" "github.com/gin-gonic/gin" @@ -134,7 +134,7 @@ func Authorize(c *gin.Context) { session := sessions.Default(c) userID := GetUserIDFromSession(session) if purpose == OAuthPurposeBind && userID == 0 { - response.AbortUnauthorized(c, common.UnAuthorized) + response.AbortUnauthorized(c, shared.UnAuthorized) return } diff --git a/internal/apps/oauth/handler_callback.go b/internal/apps/oauth/handler_callback.go index 9e1a46eb..26d1012e 100644 --- a/internal/apps/oauth/handler_callback.go +++ b/internal/apps/oauth/handler_callback.go @@ -10,12 +10,12 @@ import ( "net/http" "time" - "github.com/Rain-kl/Wavelet/internal/common" - "github.com/Rain-kl/Wavelet/internal/common/response" - "github.com/Rain-kl/Wavelet/internal/db" + "github.com/Rain-kl/Wavelet/internal/infra/persistence" "github.com/Rain-kl/Wavelet/internal/listener" "github.com/Rain-kl/Wavelet/internal/model" "github.com/Rain-kl/Wavelet/internal/repository" + "github.com/Rain-kl/Wavelet/internal/shared" + "github.com/Rain-kl/Wavelet/internal/shared/response" "github.com/Rain-kl/Wavelet/pkg/logger" "github.com/gin-contrib/sessions" "github.com/gin-gonic/gin" @@ -60,7 +60,7 @@ func Callback(c *gin.Context) { currentUserID := GetUserIDFromSession(session) if payload.Purpose == OAuthPurposeBind && currentUserID == 0 { - response.AbortUnauthorized(c, common.UnAuthorized) + response.AbortUnauthorized(c, shared.UnAuthorized) return } @@ -127,7 +127,7 @@ func Callback(c *gin.Context) { func handleCallbackBind(ctx context.Context, c *gin.Context, source *model.AuthSource, userInfo *model.OAuthUserInfo) { userID := GetUserIDFromContext(c) if userID == 0 { - response.AbortUnauthorized(c, common.UnAuthorized) + response.AbortUnauthorized(c, shared.UnAuthorized) return } var user model.User diff --git a/internal/apps/oauth/handler_external_accounts.go b/internal/apps/oauth/handler_external_accounts.go index 367275d9..bd7f9b02 100644 --- a/internal/apps/oauth/handler_external_accounts.go +++ b/internal/apps/oauth/handler_external_accounts.go @@ -8,9 +8,9 @@ import ( "strconv" "strings" - "github.com/Rain-kl/Wavelet/internal/common" - "github.com/Rain-kl/Wavelet/internal/common/response" "github.com/Rain-kl/Wavelet/internal/model" + "github.com/Rain-kl/Wavelet/internal/shared" + "github.com/Rain-kl/Wavelet/internal/shared/response" "github.com/gin-gonic/gin" ) @@ -48,7 +48,7 @@ func ListExternalAccounts(c *gin.Context) { func DeleteExternalAccount(c *gin.Context) { userID := GetUserIDFromContext(c) if userID == 0 { - response.AbortUnauthorized(c, common.UnAuthorized) + response.AbortUnauthorized(c, shared.UnAuthorized) return } rawID := strings.TrimSpace(c.Param("id")) diff --git a/internal/apps/oauth/handler_sources.go b/internal/apps/oauth/handler_sources.go index fa1c628a..2cefa790 100644 --- a/internal/apps/oauth/handler_sources.go +++ b/internal/apps/oauth/handler_sources.go @@ -6,7 +6,7 @@ package oauth import ( "net/http" - "github.com/Rain-kl/Wavelet/internal/common/response" + "github.com/Rain-kl/Wavelet/internal/shared/response" "github.com/gin-gonic/gin" ) diff --git a/internal/apps/oauth/middlewares.go b/internal/apps/oauth/middlewares.go index 6e341543..6a4d2d32 100644 --- a/internal/apps/oauth/middlewares.go +++ b/internal/apps/oauth/middlewares.go @@ -8,10 +8,10 @@ import ( "context" "errors" - "github.com/Rain-kl/Wavelet/internal/common" - "github.com/Rain-kl/Wavelet/internal/common/response" - "github.com/Rain-kl/Wavelet/internal/db" + "github.com/Rain-kl/Wavelet/internal/infra/persistence" "github.com/Rain-kl/Wavelet/internal/model" + "github.com/Rain-kl/Wavelet/internal/shared" + "github.com/Rain-kl/Wavelet/internal/shared/response" otel_trace "github.com/Rain-kl/Wavelet/pkg/trace" "github.com/gin-contrib/sessions" @@ -127,7 +127,7 @@ func LoginRequired() gin.HandlerFunc { user, err := GetUserFromRequest(c) if err != nil { - response.AbortUnauthorized(c, common.UnAuthorized) + response.AbortUnauthorized(c, shared.UnAuthorized) return } diff --git a/internal/apps/oauth/oauth_test.go b/internal/apps/oauth/oauth_test.go index 9ff0badd..d2f60a5c 100644 --- a/internal/apps/oauth/oauth_test.go +++ b/internal/apps/oauth/oauth_test.go @@ -32,8 +32,8 @@ import ( "gorm.io/driver/sqlite" "gorm.io/gorm" - "github.com/Rain-kl/Wavelet/internal/config" - "github.com/Rain-kl/Wavelet/internal/db" + "github.com/Rain-kl/Wavelet/internal/infra/config" + "github.com/Rain-kl/Wavelet/internal/infra/persistence" "github.com/Rain-kl/Wavelet/internal/model" "github.com/Rain-kl/Wavelet/internal/repository" "github.com/Rain-kl/Wavelet/internal/testhelper" diff --git a/internal/apps/oauth/oauth_userinfo.go b/internal/apps/oauth/oauth_userinfo.go index 84ae7124..32bdecb1 100644 --- a/internal/apps/oauth/oauth_userinfo.go +++ b/internal/apps/oauth/oauth_userinfo.go @@ -9,7 +9,7 @@ import ( "fmt" "strings" - "github.com/Rain-kl/Wavelet/internal/db" + "github.com/Rain-kl/Wavelet/internal/infra/persistence" "github.com/Rain-kl/Wavelet/internal/model" "github.com/coreos/go-oidc/v3/oidc" "golang.org/x/oauth2" diff --git a/internal/apps/oauth/routers.go b/internal/apps/oauth/routers.go index 8d2e13f6..a5a44799 100644 --- a/internal/apps/oauth/routers.go +++ b/internal/apps/oauth/routers.go @@ -12,7 +12,7 @@ import ( "github.com/gin-contrib/sessions" "github.com/gin-gonic/gin" - "github.com/Rain-kl/Wavelet/internal/common/response" + "github.com/Rain-kl/Wavelet/internal/shared/response" ) // BasicUserInfo 用户基本信息结构体 diff --git a/internal/apps/oauth/session.go b/internal/apps/oauth/session.go index fe653b42..0aeb1486 100644 --- a/internal/apps/oauth/session.go +++ b/internal/apps/oauth/session.go @@ -8,7 +8,7 @@ import ( "net/http" "strings" - "github.com/Rain-kl/Wavelet/internal/config" + "github.com/Rain-kl/Wavelet/internal/infra/config" "github.com/gin-contrib/sessions" ) diff --git a/internal/apps/oauth/session_context.go b/internal/apps/oauth/session_context.go index 672d514d..45237375 100644 --- a/internal/apps/oauth/session_context.go +++ b/internal/apps/oauth/session_context.go @@ -8,7 +8,7 @@ import ( "crypto/sha256" "encoding/hex" - "github.com/Rain-kl/Wavelet/internal/config" + "github.com/Rain-kl/Wavelet/internal/infra/config" "github.com/Rain-kl/Wavelet/internal/model" "github.com/Rain-kl/Wavelet/internal/repository" "github.com/gin-contrib/sessions" diff --git a/internal/apps/risk_control/logics.go b/internal/apps/risk_control/logics.go index db3f1079..02d70df7 100644 --- a/internal/apps/risk_control/logics.go +++ b/internal/apps/risk_control/logics.go @@ -7,10 +7,10 @@ import ( "context" "sync" - "github.com/Rain-kl/Wavelet/internal/config" - "github.com/Rain-kl/Wavelet/internal/db/batchwriter" - "github.com/Rain-kl/Wavelet/internal/lifecycle" + "github.com/Rain-kl/Wavelet/internal/infra/config" + "github.com/Rain-kl/Wavelet/internal/infra/persistence/batchwriter" "github.com/Rain-kl/Wavelet/internal/model/analytics" + "github.com/Rain-kl/Wavelet/internal/platform/lifecycle" analyticsrepo "github.com/Rain-kl/Wavelet/internal/repository/analytics" "github.com/Rain-kl/Wavelet/pkg/logger" ) diff --git a/internal/apps/risk_control/middleware.go b/internal/apps/risk_control/middleware.go index 9de6ba53..e330751d 100644 --- a/internal/apps/risk_control/middleware.go +++ b/internal/apps/risk_control/middleware.go @@ -10,11 +10,11 @@ import ( "time" "github.com/Rain-kl/Wavelet/internal/apps/oauth" - "github.com/Rain-kl/Wavelet/internal/common/response" - "github.com/Rain-kl/Wavelet/internal/config" - "github.com/Rain-kl/Wavelet/internal/db/idgen" + "github.com/Rain-kl/Wavelet/internal/infra/config" + "github.com/Rain-kl/Wavelet/internal/infra/persistence/idgen" "github.com/Rain-kl/Wavelet/internal/model" "github.com/Rain-kl/Wavelet/internal/model/analytics" + "github.com/Rain-kl/Wavelet/internal/shared/response" "github.com/gin-gonic/gin" ) diff --git a/internal/apps/risk_control/middleware_test.go b/internal/apps/risk_control/middleware_test.go index 2fcb58e5..60f33b2e 100644 --- a/internal/apps/risk_control/middleware_test.go +++ b/internal/apps/risk_control/middleware_test.go @@ -13,8 +13,8 @@ import ( "time" "github.com/Rain-kl/Wavelet/internal/apps/oauth" - "github.com/Rain-kl/Wavelet/internal/config" - "github.com/Rain-kl/Wavelet/internal/db/batchwriter" + "github.com/Rain-kl/Wavelet/internal/infra/config" + "github.com/Rain-kl/Wavelet/internal/infra/persistence/batchwriter" "github.com/Rain-kl/Wavelet/internal/model" "github.com/Rain-kl/Wavelet/internal/model/analytics" "github.com/Rain-kl/Wavelet/internal/testhelper" diff --git a/internal/apps/upload/cache/access_cache.go b/internal/apps/upload/cache/access_cache.go index 5aab2a72..fc9c9bfc 100644 --- a/internal/apps/upload/cache/access_cache.go +++ b/internal/apps/upload/cache/access_cache.go @@ -13,10 +13,10 @@ import ( "github.com/Rain-kl/Wavelet/internal/apps/upload/shared" uploadstorage "github.com/Rain-kl/Wavelet/internal/apps/upload/storage" - "github.com/Rain-kl/Wavelet/internal/db" + "github.com/Rain-kl/Wavelet/internal/infra/objectstore" + "github.com/Rain-kl/Wavelet/internal/infra/persistence" "github.com/Rain-kl/Wavelet/internal/model" "github.com/Rain-kl/Wavelet/internal/repository" - "github.com/Rain-kl/Wavelet/internal/storage" ) const fileAccessInvalidationChannel = "upload:file_access_invalidation" @@ -59,7 +59,7 @@ func startAccessCacheInvalidationListener() { go func() { pubsub := db.Redis.Subscribe( context.Background(), - storage.ConfigInvalidationChannel, + objectstore.ConfigInvalidationChannel, fileAccessInvalidationChannel, ) defer func() { diff --git a/internal/apps/upload/cache/access_cache_test.go b/internal/apps/upload/cache/access_cache_test.go index 80b9180b..363650b7 100644 --- a/internal/apps/upload/cache/access_cache_test.go +++ b/internal/apps/upload/cache/access_cache_test.go @@ -10,7 +10,7 @@ import ( "github.com/Rain-kl/Wavelet/internal/apps/upload/shared" uploadstorage "github.com/Rain-kl/Wavelet/internal/apps/upload/storage" - "github.com/Rain-kl/Wavelet/internal/db" + "github.com/Rain-kl/Wavelet/internal/infra/persistence" "github.com/Rain-kl/Wavelet/internal/model" "github.com/Rain-kl/Wavelet/internal/repository" "github.com/Rain-kl/Wavelet/internal/testhelper" diff --git a/internal/apps/upload/cache/meta_cache.go b/internal/apps/upload/cache/meta_cache.go index b5b9d606..4101cc52 100644 --- a/internal/apps/upload/cache/meta_cache.go +++ b/internal/apps/upload/cache/meta_cache.go @@ -9,7 +9,7 @@ import ( "fmt" "sync" - "github.com/Rain-kl/Wavelet/internal/db" + "github.com/Rain-kl/Wavelet/internal/infra/persistence" "github.com/Rain-kl/Wavelet/internal/model" "github.com/Rain-kl/Wavelet/pkg/cache/ram" ) diff --git a/internal/apps/upload/cache/meta_cache_test.go b/internal/apps/upload/cache/meta_cache_test.go index 01009b1a..bd42676a 100644 --- a/internal/apps/upload/cache/meta_cache_test.go +++ b/internal/apps/upload/cache/meta_cache_test.go @@ -9,7 +9,7 @@ import ( "testing" "time" - "github.com/Rain-kl/Wavelet/internal/db" + "github.com/Rain-kl/Wavelet/internal/infra/persistence" "github.com/Rain-kl/Wavelet/internal/model" "github.com/Rain-kl/Wavelet/internal/testhelper" "gorm.io/gorm" diff --git a/internal/apps/upload/exports.go b/internal/apps/upload/exports.go index 981f0c4c..d2c4273f 100644 --- a/internal/apps/upload/exports.go +++ b/internal/apps/upload/exports.go @@ -11,7 +11,7 @@ import ( uploadstats "github.com/Rain-kl/Wavelet/internal/apps/upload/stats" uploadtask "github.com/Rain-kl/Wavelet/internal/apps/upload/task" "github.com/Rain-kl/Wavelet/internal/apps/upload/util" - "github.com/Rain-kl/Wavelet/internal/task" + "github.com/Rain-kl/Wavelet/internal/infra/task" ) // HTTP handlers diff --git a/internal/apps/upload/filesrv/file_server.go b/internal/apps/upload/filesrv/file_server.go index 573b48cd..04d0ac34 100644 --- a/internal/apps/upload/filesrv/file_server.go +++ b/internal/apps/upload/filesrv/file_server.go @@ -20,10 +20,10 @@ import ( "github.com/Rain-kl/Wavelet/internal/apps/upload/shared" uploadstorage "github.com/Rain-kl/Wavelet/internal/apps/upload/storage" "github.com/Rain-kl/Wavelet/internal/apps/upload/util" - "github.com/Rain-kl/Wavelet/internal/common" - "github.com/Rain-kl/Wavelet/internal/common/response" - "github.com/Rain-kl/Wavelet/internal/diskcache" + "github.com/Rain-kl/Wavelet/internal/infra/diskcache" "github.com/Rain-kl/Wavelet/internal/model" + appshared "github.com/Rain-kl/Wavelet/internal/shared" + "github.com/Rain-kl/Wavelet/internal/shared/response" "github.com/Rain-kl/Wavelet/pkg/logger" "github.com/gin-gonic/gin" @@ -77,7 +77,7 @@ func ServeFileByID(c *gin.Context) { } if err := CheckFileAccessPermission(c, upload); err != nil { - response.AbortUnauthorized(c, common.UnAuthorized) + response.AbortUnauthorized(c, appshared.UnAuthorized) return } diff --git a/internal/apps/upload/filesrv/file_server_test.go b/internal/apps/upload/filesrv/file_server_test.go index b56cca3c..050b9993 100644 --- a/internal/apps/upload/filesrv/file_server_test.go +++ b/internal/apps/upload/filesrv/file_server_test.go @@ -20,13 +20,13 @@ import ( "github.com/Rain-kl/Wavelet/internal/apps/upload/cache" "github.com/Rain-kl/Wavelet/internal/apps/upload/shared" "github.com/Rain-kl/Wavelet/internal/apps/upload/util" - "github.com/Rain-kl/Wavelet/internal/common" - "github.com/Rain-kl/Wavelet/internal/common/response" - "github.com/Rain-kl/Wavelet/internal/db" - "github.com/Rain-kl/Wavelet/internal/diskcache" + "github.com/Rain-kl/Wavelet/internal/infra/diskcache" + "github.com/Rain-kl/Wavelet/internal/infra/objectstore" + "github.com/Rain-kl/Wavelet/internal/infra/persistence" "github.com/Rain-kl/Wavelet/internal/model" "github.com/Rain-kl/Wavelet/internal/repository" - "github.com/Rain-kl/Wavelet/internal/storage" + appshared "github.com/Rain-kl/Wavelet/internal/shared" + "github.com/Rain-kl/Wavelet/internal/shared/response" "github.com/Rain-kl/Wavelet/internal/testhelper" "github.com/gin-contrib/sessions" "github.com/gin-contrib/sessions/cookie" @@ -138,8 +138,8 @@ func TestServeFileByIDAccessControl(t *testing.T) { if err := json.Unmarshal(w.Body.Bytes(), &body); err != nil { t.Fatalf("failed to parse JSON: %v", err) } - if body["error_msg"] != common.UnAuthorized { - t.Errorf("expected error_msg %q, got %v", common.UnAuthorized, body["error_msg"]) + if body["error_msg"] != appshared.UnAuthorized { + t.Errorf("expected error_msg %q, got %v", appshared.UnAuthorized, body["error_msg"]) } }) @@ -361,7 +361,7 @@ func configureLocalStorageRoot(t *testing.T, dbConn *gorm.DB, tempDir string) { if err := dbConn.Where("key = ?", model.ConfigKeyStorageConfig).First(&sc).Error; err != nil { t.Fatalf("failed to find storage config: %v", err) } - var cfg storage.Config + var cfg objectstore.Config if err := json.Unmarshal([]byte(sc.Value), &cfg); err != nil { t.Fatalf("failed to unmarshal storage config: %v", err) } @@ -376,5 +376,5 @@ func configureLocalStorageRoot(t *testing.T, dbConn *gorm.DB, tempDir string) { } _ = db.HSetJSON(context.Background(), repository.SystemConfigRedisHashKey, sc.Key, &sc) repository.ResetSystemConfigRAMCacheForTest() - storage.ResetCache() + objectstore.ResetCache() } diff --git a/internal/apps/upload/handler/file_management.go b/internal/apps/upload/handler/file_management.go index 075d72e8..dee92a39 100644 --- a/internal/apps/upload/handler/file_management.go +++ b/internal/apps/upload/handler/file_management.go @@ -11,9 +11,9 @@ import ( "github.com/Rain-kl/Wavelet/internal/apps/upload/ingest" "github.com/Rain-kl/Wavelet/internal/apps/upload/shared" uploadstorage "github.com/Rain-kl/Wavelet/internal/apps/upload/storage" - "github.com/Rain-kl/Wavelet/internal/common/response" "github.com/Rain-kl/Wavelet/internal/model" "github.com/Rain-kl/Wavelet/internal/repository" + "github.com/Rain-kl/Wavelet/internal/shared/response" "github.com/gin-gonic/gin" ) diff --git a/internal/apps/upload/handler/routers.go b/internal/apps/upload/handler/routers.go index 025052c4..9ab81fbb 100644 --- a/internal/apps/upload/handler/routers.go +++ b/internal/apps/upload/handler/routers.go @@ -28,9 +28,9 @@ import ( "github.com/Rain-kl/Wavelet/internal/apps/upload/shared" uploadstorage "github.com/Rain-kl/Wavelet/internal/apps/upload/storage" "github.com/Rain-kl/Wavelet/internal/apps/upload/util" - "github.com/Rain-kl/Wavelet/internal/common" - "github.com/Rain-kl/Wavelet/internal/common/response" "github.com/Rain-kl/Wavelet/internal/model" + appshared "github.com/Rain-kl/Wavelet/internal/shared" + "github.com/Rain-kl/Wavelet/internal/shared/response" "github.com/Rain-kl/Wavelet/pkg/logger" "github.com/gin-gonic/gin" "gorm.io/gorm" @@ -182,7 +182,7 @@ func DownloadFile(c *gin.Context) { } if err := filesrv.CheckFileAccessPermission(c, upload); err != nil { - response.AbortUnauthorized(c, common.UnAuthorized) + response.AbortUnauthorized(c, appshared.UnAuthorized) return } diff --git a/internal/apps/upload/handler/routers_test.go b/internal/apps/upload/handler/routers_test.go index dea5a99a..10b2ddd0 100644 --- a/internal/apps/upload/handler/routers_test.go +++ b/internal/apps/upload/handler/routers_test.go @@ -22,11 +22,11 @@ import ( "github.com/Rain-kl/Wavelet/internal/apps/oauth" "github.com/Rain-kl/Wavelet/internal/apps/upload/shared" uploadstats "github.com/Rain-kl/Wavelet/internal/apps/upload/stats" - "github.com/Rain-kl/Wavelet/internal/common/response" - "github.com/Rain-kl/Wavelet/internal/db" + "github.com/Rain-kl/Wavelet/internal/infra/objectstore" + "github.com/Rain-kl/Wavelet/internal/infra/persistence" "github.com/Rain-kl/Wavelet/internal/model" "github.com/Rain-kl/Wavelet/internal/repository" - "github.com/Rain-kl/Wavelet/internal/storage" + "github.com/Rain-kl/Wavelet/internal/shared/response" "github.com/Rain-kl/Wavelet/internal/testhelper" "github.com/gin-gonic/gin" ) @@ -113,7 +113,7 @@ func TestUploadFile(t *testing.T) { mockFiles := make(map[string][]byte) var putCount int - restoreStorage := storage.MockStorage( + restoreStorage := objectstore.MockStorage( func(ctx context.Context, key string, body io.Reader, size int64, contentType string) error { data, err := io.ReadAll(body) if err != nil { @@ -123,12 +123,12 @@ func TestUploadFile(t *testing.T) { putCount++ return nil }, - func(ctx context.Context, key string) (*storage.Object, error) { + func(ctx context.Context, key string) (*objectstore.Object, error) { data, ok := mockFiles[key] if !ok { return nil, os.ErrNotExist } - return &storage.Object{ + return &objectstore.Object{ Body: io.NopCloser(bytes.NewReader(data)), ContentLength: int64(len(data)), ContentType: "application/octet-stream", @@ -142,9 +142,9 @@ func TestUploadFile(t *testing.T) { defer restoreStorage() // 开启 S3 Storage - storage.IsEnabledFunc = func() bool { return true } + objectstore.IsEnabledFunc = func() bool { return true } defer func() { - storage.IsEnabledFunc = func() bool { return false } + objectstore.IsEnabledFunc = func() bool { return false } }() t.Run("upload allowed image file successfully", func(t *testing.T) { @@ -286,7 +286,7 @@ func TestUploadFile(t *testing.T) { t.Run("upload in local storage fallback mode", func(t *testing.T) { // Turn off S3 - storage.IsEnabledFunc = func() bool { return false } + objectstore.IsEnabledFunc = func() bool { return false } // Seed allowed extensions configuration to allow txt files var sc model.SystemConfig diff --git a/internal/apps/upload/handler/stats.go b/internal/apps/upload/handler/stats.go index 0ef06bb9..e14536bc 100644 --- a/internal/apps/upload/handler/stats.go +++ b/internal/apps/upload/handler/stats.go @@ -8,8 +8,8 @@ import ( "time" "github.com/Rain-kl/Wavelet/internal/apps/upload/shared" - "github.com/Rain-kl/Wavelet/internal/common/response" "github.com/Rain-kl/Wavelet/internal/model" + "github.com/Rain-kl/Wavelet/internal/shared/response" "github.com/gin-gonic/gin" ) diff --git a/internal/apps/upload/ingest/helpers.go b/internal/apps/upload/ingest/helpers.go index 00580a90..a52ba1f5 100644 --- a/internal/apps/upload/ingest/helpers.go +++ b/internal/apps/upload/ingest/helpers.go @@ -15,11 +15,11 @@ import ( "github.com/Rain-kl/Wavelet/internal/apps/upload/shared" uploadstats "github.com/Rain-kl/Wavelet/internal/apps/upload/stats" uploadstorage "github.com/Rain-kl/Wavelet/internal/apps/upload/storage" - "github.com/Rain-kl/Wavelet/internal/db" - "github.com/Rain-kl/Wavelet/internal/db/idgen" + "github.com/Rain-kl/Wavelet/internal/infra/objectstore" + "github.com/Rain-kl/Wavelet/internal/infra/persistence" + "github.com/Rain-kl/Wavelet/internal/infra/persistence/idgen" "github.com/Rain-kl/Wavelet/internal/model" "github.com/Rain-kl/Wavelet/internal/repository" - "github.com/Rain-kl/Wavelet/internal/storage" "github.com/Rain-kl/Wavelet/pkg/logger" "gorm.io/gorm" ) @@ -84,7 +84,7 @@ func storeObject(ctx context.Context, objectKey string, reader io.Reader, size i return "", ErrStorageReadOnly } - driver, backend, err := storage.Active(ctx) + driver, backend, err := objectstore.Active(ctx) if err != nil { logger.ErrorF(ctx, "初始化活动存储失败: %v", err) return "", errors.New(shared.ErrSaveFileFailed) @@ -102,7 +102,7 @@ func storeObject(ctx context.Context, objectKey string, reader io.Reader, size i func persistUploadRecord(ctx context.Context, upload *model.Upload, objectKey string) error { if err := createUploadWithStats(ctx, upload); err != nil { - _, backend, backendErr := storage.Active(ctx) + _, backend, backendErr := objectstore.Active(ctx) if backendErr == nil { if deleteErr := backend.Delete(ctx, objectKey); deleteErr != nil { logger.WarnF(ctx, "清理未写入数据库的上传对象失败: %v", deleteErr) diff --git a/internal/apps/upload/ingest/ingest_test.go b/internal/apps/upload/ingest/ingest_test.go index d70bedc7..fd8276dc 100644 --- a/internal/apps/upload/ingest/ingest_test.go +++ b/internal/apps/upload/ingest/ingest_test.go @@ -13,9 +13,9 @@ import ( "testing" "time" - "github.com/Rain-kl/Wavelet/internal/db" + "github.com/Rain-kl/Wavelet/internal/infra/objectstore" + "github.com/Rain-kl/Wavelet/internal/infra/persistence" "github.com/Rain-kl/Wavelet/internal/model" - "github.com/Rain-kl/Wavelet/internal/storage" "github.com/Rain-kl/Wavelet/internal/testhelper" ) @@ -291,7 +291,7 @@ func loadTotalStats(ctx context.Context) (totalStatsSnapshot, error) { func setupMockStorage(t *testing.T, putCount *int) (restore func(), disable func()) { t.Helper() mockFiles := make(map[string][]byte) - restore = storage.MockStorage( + restore = objectstore.MockStorage( func(ctx context.Context, key string, body io.Reader, size int64, contentType string) error { data, err := io.ReadAll(body) if err != nil { @@ -303,12 +303,12 @@ func setupMockStorage(t *testing.T, putCount *int) (restore func(), disable func } return nil }, - func(ctx context.Context, key string) (*storage.Object, error) { + func(ctx context.Context, key string) (*objectstore.Object, error) { data, ok := mockFiles[key] if !ok { return nil, os.ErrNotExist } - return &storage.Object{ + return &objectstore.Object{ Body: io.NopCloser(bytes.NewReader(data)), ContentLength: int64(len(data)), ContentType: "application/octet-stream", @@ -319,11 +319,11 @@ func setupMockStorage(t *testing.T, putCount *int) (restore func(), disable func return nil }, ) - storage.IsEnabledFunc = func() bool { return true } - storage.ResetCache() + objectstore.IsEnabledFunc = func() bool { return true } + objectstore.ResetCache() disable = func() { - storage.IsEnabledFunc = func() bool { return false } - storage.ResetCache() + objectstore.IsEnabledFunc = func() bool { return false } + objectstore.ResetCache() } return restore, disable } diff --git a/internal/apps/upload/ingest/remove.go b/internal/apps/upload/ingest/remove.go index 902ab5ef..001f1889 100644 --- a/internal/apps/upload/ingest/remove.go +++ b/internal/apps/upload/ingest/remove.go @@ -8,7 +8,7 @@ import ( uploadcache "github.com/Rain-kl/Wavelet/internal/apps/upload/cache" uploadstats "github.com/Rain-kl/Wavelet/internal/apps/upload/stats" - "github.com/Rain-kl/Wavelet/internal/db" + "github.com/Rain-kl/Wavelet/internal/infra/persistence" "github.com/Rain-kl/Wavelet/internal/model" "github.com/Rain-kl/Wavelet/internal/repository" "gorm.io/gorm" diff --git a/internal/apps/upload/stats/stats_counter.go b/internal/apps/upload/stats/stats_counter.go index 810dc875..c3fad02e 100644 --- a/internal/apps/upload/stats/stats_counter.go +++ b/internal/apps/upload/stats/stats_counter.go @@ -7,7 +7,7 @@ import ( "context" "time" - "github.com/Rain-kl/Wavelet/internal/db" + "github.com/Rain-kl/Wavelet/internal/infra/persistence" "github.com/Rain-kl/Wavelet/internal/model" "github.com/Rain-kl/Wavelet/pkg/logger" "gorm.io/gorm" diff --git a/internal/apps/upload/stats/stats_counter_test.go b/internal/apps/upload/stats/stats_counter_test.go index 02d6c7b4..156eacf6 100644 --- a/internal/apps/upload/stats/stats_counter_test.go +++ b/internal/apps/upload/stats/stats_counter_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - "github.com/Rain-kl/Wavelet/internal/db" + "github.com/Rain-kl/Wavelet/internal/infra/persistence" "github.com/Rain-kl/Wavelet/internal/model" "github.com/Rain-kl/Wavelet/internal/testhelper" "gorm.io/gorm" diff --git a/internal/apps/upload/storage/access_state.go b/internal/apps/upload/storage/access_state.go index 7c88f355..dceda766 100644 --- a/internal/apps/upload/storage/access_state.go +++ b/internal/apps/upload/storage/access_state.go @@ -10,14 +10,14 @@ import ( "time" "github.com/Rain-kl/Wavelet/internal/apps/upload/shared" + "github.com/Rain-kl/Wavelet/internal/infra/objectstore" "github.com/Rain-kl/Wavelet/internal/model" - "github.com/Rain-kl/Wavelet/internal/storage" ) // MigrationAccessState captures cached migration maintenance state. type MigrationAccessState struct { ReadOnly bool - Target storage.Config + Target objectstore.Config HasTarget bool TargetErr error LoadErr error diff --git a/internal/apps/upload/storage/migration.go b/internal/apps/upload/storage/migration.go index f3fbe9dc..c3c98bea 100644 --- a/internal/apps/upload/storage/migration.go +++ b/internal/apps/upload/storage/migration.go @@ -10,9 +10,9 @@ import ( "fmt" "strings" - "github.com/Rain-kl/Wavelet/internal/db" + "github.com/Rain-kl/Wavelet/internal/infra/objectstore" + "github.com/Rain-kl/Wavelet/internal/infra/persistence" "github.com/Rain-kl/Wavelet/internal/model" - "github.com/Rain-kl/Wavelet/internal/storage" "gorm.io/gorm" ) @@ -36,20 +36,20 @@ func LatestMigrationExecution(ctx context.Context) (*model.TaskExecution, bool, } // ParseMigrationTargetConfig parses and validates a storage migration target payload. -func ParseMigrationTargetConfig(ctx context.Context, payload []byte) (storage.Config, error) { +func ParseMigrationTargetConfig(ctx context.Context, payload []byte) (objectstore.Config, error) { if strings.TrimSpace(string(payload)) == "" { - return storage.Config{}, errors.New("storage migration target payload is required") + return objectstore.Config{}, errors.New("storage migration target payload is required") } var raw struct { Target json.RawMessage `json:"target"` } if err := json.Unmarshal(payload, &raw); err != nil { - return storage.Config{}, fmt.Errorf("parse storage migration payload envelope: %w", err) + return objectstore.Config{}, fmt.Errorf("parse storage migration payload envelope: %w", err) } if len(raw.Target) == 0 { - return storage.Config{}, errors.New("storage migration target payload is required") + return objectstore.Config{}, errors.New("storage migration target payload is required") } var targetBytes []byte @@ -60,34 +60,34 @@ func ParseMigrationTargetConfig(ctx context.Context, payload []byte) (storage.Co targetBytes = raw.Target } - var target storage.Config + var target objectstore.Config if err := json.Unmarshal(targetBytes, &target); err != nil { - return storage.Config{}, fmt.Errorf("parse target storage config: %w", err) + return objectstore.Config{}, fmt.Errorf("parse target storage config: %w", err) } - current, err := storage.LoadConfig(ctx) + current, err := objectstore.LoadConfig(ctx) if err != nil { - return storage.Config{}, fmt.Errorf("load active storage config: %w", err) + return objectstore.Config{}, fmt.Errorf("load active storage config: %w", err) } - target = storage.MergeMaskedSecrets(target, current) - if err := storage.ValidateConfig(target); err != nil { - return storage.Config{}, fmt.Errorf("validate target storage config: %w", err) + target = objectstore.MergeMaskedSecrets(target, current) + if err := objectstore.ValidateConfig(target); err != nil { + return objectstore.Config{}, fmt.Errorf("validate target storage config: %w", err) } return target, nil } // NormalizeMigrationPayload validates and normalizes a storage migration payload. -func NormalizeMigrationPayload(ctx context.Context, payload []byte) ([]byte, storage.Config, error) { +func NormalizeMigrationPayload(ctx context.Context, payload []byte) ([]byte, objectstore.Config, error) { target, err := ParseMigrationTargetConfig(ctx, payload) if err != nil { - return nil, storage.Config{}, err + return nil, objectstore.Config{}, err } type storageMigrationPayload struct { - Target storage.Config `json:"target"` + Target objectstore.Config `json:"target"` } normalized, err := json.Marshal(storageMigrationPayload{Target: target}) if err != nil { - return nil, storage.Config{}, fmt.Errorf("marshal storage migration payload: %w", err) + return nil, objectstore.Config{}, fmt.Errorf("marshal storage migration payload: %w", err) } return normalized, target, nil } diff --git a/internal/apps/upload/storage/storage_ops.go b/internal/apps/upload/storage/storage_ops.go index cb09da9c..892691ef 100644 --- a/internal/apps/upload/storage/storage_ops.go +++ b/internal/apps/upload/storage/storage_ops.go @@ -6,8 +6,8 @@ package storage import ( "context" + "github.com/Rain-kl/Wavelet/internal/infra/objectstore" "github.com/Rain-kl/Wavelet/internal/model" - "github.com/Rain-kl/Wavelet/internal/storage" "github.com/Rain-kl/Wavelet/pkg/logger" ) @@ -22,8 +22,8 @@ func ReadOnly(ctx context.Context) bool { } // OpenStoredObject opens a stored upload object from the active storage backend. -func OpenStoredObject(ctx context.Context, upload *model.Upload) (*storage.Object, error) { - _, backend, err := storage.Active(ctx) +func OpenStoredObject(ctx context.Context, upload *model.Upload) (*objectstore.Object, error) { + _, backend, err := objectstore.Active(ctx) if err != nil { return nil, err } diff --git a/internal/apps/upload/task/cleanup.go b/internal/apps/upload/task/cleanup.go index 0d70e35d..accd651a 100644 --- a/internal/apps/upload/task/cleanup.go +++ b/internal/apps/upload/task/cleanup.go @@ -14,10 +14,10 @@ import ( "github.com/Rain-kl/Wavelet/internal/apps/upload/shared" uploadstats "github.com/Rain-kl/Wavelet/internal/apps/upload/stats" uploadstorage "github.com/Rain-kl/Wavelet/internal/apps/upload/storage" - "github.com/Rain-kl/Wavelet/internal/db" + "github.com/Rain-kl/Wavelet/internal/infra/objectstore" + "github.com/Rain-kl/Wavelet/internal/infra/persistence" + "github.com/Rain-kl/Wavelet/internal/infra/task" "github.com/Rain-kl/Wavelet/internal/model" - "github.com/Rain-kl/Wavelet/internal/storage" - "github.com/Rain-kl/Wavelet/internal/task" "github.com/Rain-kl/Wavelet/pkg/logger" "gorm.io/gorm" ) @@ -85,7 +85,7 @@ func (h *SystemCleanupHandler) Execute(ctx context.Context, _ []byte) (*task.Tas return err } - _, backend, err := storage.Active(ctx) + _, backend, err := objectstore.Active(ctx) if err != nil { return err } diff --git a/internal/apps/upload/task/rebuild_stats.go b/internal/apps/upload/task/rebuild_stats.go index 018def05..605a506b 100644 --- a/internal/apps/upload/task/rebuild_stats.go +++ b/internal/apps/upload/task/rebuild_stats.go @@ -8,9 +8,9 @@ import ( "fmt" uploadstats "github.com/Rain-kl/Wavelet/internal/apps/upload/stats" - "github.com/Rain-kl/Wavelet/internal/db" + "github.com/Rain-kl/Wavelet/internal/infra/persistence" + "github.com/Rain-kl/Wavelet/internal/infra/task" "github.com/Rain-kl/Wavelet/internal/model" - "github.com/Rain-kl/Wavelet/internal/task" ) const ( diff --git a/internal/apps/upload/task/rebuild_stats_test.go b/internal/apps/upload/task/rebuild_stats_test.go index e0e185be..e73e4d58 100644 --- a/internal/apps/upload/task/rebuild_stats_test.go +++ b/internal/apps/upload/task/rebuild_stats_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - "github.com/Rain-kl/Wavelet/internal/db" + "github.com/Rain-kl/Wavelet/internal/infra/persistence" "github.com/Rain-kl/Wavelet/internal/model" "github.com/Rain-kl/Wavelet/internal/testhelper" ) diff --git a/internal/apps/upload/task/storage_migration.go b/internal/apps/upload/task/storage_migration.go index daabd390..473f0da6 100644 --- a/internal/apps/upload/task/storage_migration.go +++ b/internal/apps/upload/task/storage_migration.go @@ -17,10 +17,10 @@ import ( uploadstats "github.com/Rain-kl/Wavelet/internal/apps/upload/stats" uploadstorage "github.com/Rain-kl/Wavelet/internal/apps/upload/storage" - "github.com/Rain-kl/Wavelet/internal/db" + "github.com/Rain-kl/Wavelet/internal/infra/objectstore" + "github.com/Rain-kl/Wavelet/internal/infra/persistence" + "github.com/Rain-kl/Wavelet/internal/infra/task" "github.com/Rain-kl/Wavelet/internal/model" - "github.com/Rain-kl/Wavelet/internal/storage" - "github.com/Rain-kl/Wavelet/internal/task" "golang.org/x/sync/errgroup" ) @@ -117,7 +117,7 @@ func (h *MigrationHandler) Execute(ctx context.Context, payload []byte) (*task.T }() } - active, err := storage.LoadConfig(ctx) + active, err := objectstore.LoadConfig(ctx) if err != nil { return nil, fmt.Errorf("load active storage config: %w", err) } @@ -126,7 +126,7 @@ func (h *MigrationHandler) Execute(ctx context.Context, payload []byte) (*task.T return nil, err } if target.Driver == active.Driver { - if err := storage.SaveActiveConfig(ctx, target); err != nil { + if err := objectstore.SaveActiveConfig(ctx, target); err != nil { return nil, fmt.Errorf("activate same-driver storage config: %w", err) } message := fmt.Sprintf("存储配置已更新，活动存储保持为 %s", target.Driver) @@ -139,7 +139,7 @@ func (h *MigrationHandler) Execute(ctx context.Context, payload []byte) (*task.T return nil, fmt.Errorf("count source objects: %w", err) } if total == 0 { - if err := storage.SaveActiveConfig(ctx, target); err != nil { + if err := objectstore.SaveActiveConfig(ctx, target); err != nil { return nil, fmt.Errorf("activate empty storage config: %w", err) } message := fmt.Sprintf("当前存储没有需要迁移的对象，活动存储已切换为 %s", target.Driver) @@ -147,11 +147,11 @@ func (h *MigrationHandler) Execute(ctx context.Context, payload []byte) (*task.T return &task.TaskResult{Message: message}, nil } - sourceBackend, err := storage.NewBackend(ctx, active, active.Driver) + sourceBackend, err := objectstore.NewBackend(ctx, active, active.Driver) if err != nil { return nil, fmt.Errorf("create source storage: %w", err) } - targetBackend, err := storage.NewBackend(ctx, target, target.Driver) + targetBackend, err := objectstore.NewBackend(ctx, target, target.Driver) if err != nil { return nil, fmt.Errorf("create target storage: %w", err) } @@ -162,7 +162,7 @@ func (h *MigrationHandler) Execute(ctx context.Context, payload []byte) (*task.T return nil, err } - if err := storage.SaveActiveConfig(ctx, target); err != nil { + if err := objectstore.SaveActiveConfig(ctx, target); err != nil { return nil, fmt.Errorf("activate target storage: %w", err) } message := fmt.Sprintf("存储迁移完成，共迁移 %d 个对象，活动存储已切换为 %s", migrated, target.Driver) @@ -196,8 +196,8 @@ type migrationObject struct { func migrateObjects( ctx context.Context, - sourceBackend storage.Backend, - targetBackend storage.Backend, + sourceBackend objectstore.Backend, + targetBackend objectstore.Backend, total int64, ) (int64, error) { const batchSize = 50 @@ -258,8 +258,8 @@ func migrateObjects( func migrateSingleObject( ctx context.Context, - sourceBackend storage.Backend, - targetBackend storage.Backend, + sourceBackend objectstore.Backend, + targetBackend objectstore.Backend, obj migrationObject, sha256HexLength int, ) error { @@ -322,7 +322,7 @@ func migrateSingleObject( func shouldSkipMigration( ctx context.Context, - targetBackend storage.Backend, + targetBackend objectstore.Backend, obj migrationObject, ) bool { targetObj, err := targetBackend.Get(ctx, obj.FilePath) diff --git a/internal/apps/upload/task/storage_migration_task_test.go b/internal/apps/upload/task/storage_migration_task_test.go index 79bb4ba0..a531c3f3 100644 --- a/internal/apps/upload/task/storage_migration_task_test.go +++ b/internal/apps/upload/task/storage_migration_task_test.go @@ -16,9 +16,9 @@ import ( "testing" "time" - "github.com/Rain-kl/Wavelet/internal/db" + "github.com/Rain-kl/Wavelet/internal/infra/objectstore" + "github.com/Rain-kl/Wavelet/internal/infra/persistence" "github.com/Rain-kl/Wavelet/internal/model" - "github.com/Rain-kl/Wavelet/internal/storage" "github.com/Rain-kl/Wavelet/internal/testhelper" "github.com/alicebob/miniredis/v2" "github.com/redis/go-redis/v9" @@ -39,21 +39,21 @@ func TestMigrationHandlerExecute(t *testing.T) { } ctx := context.Background() - active := storage.DefaultConfig() + active := objectstore.DefaultConfig() active.Local.Root = sourceRoot - if err := storage.SaveActiveConfig(ctx, active); err != nil { + if err := objectstore.SaveActiveConfig(ctx, active); err != nil { t.Fatalf("SaveActiveConfig() returned error: %v", err) } - target := storage.DefaultConfig() - target.Driver = storage.DriverS3 - target.S3 = storage.ObjectConfig{ + target := objectstore.DefaultConfig() + target.Driver = objectstore.DriverS3 + target.S3 = objectstore.ObjectConfig{ Region: "us-east-1", Bucket: "target", AccessKeyID: "key", SecretAccessKey: "secret", } payload, err := json.Marshal(struct { - Target storage.Config `json:"target"` + Target objectstore.Config `json:"target"` }{Target: target}) if err != nil { t.Fatalf("Marshal(storageMigrationPayload) returned error: %v", err) @@ -76,12 +76,12 @@ func TestMigrationHandlerExecute(t *testing.T) { } var copied bytes.Buffer - restore := storage.MockStorage( + restore := objectstore.MockStorage( func(_ context.Context, _ string, body io.Reader, _ int64, _ string) error { _, err := io.Copy(&copied, body) return err }, - func(context.Context, string) (*storage.Object, error) { + func(context.Context, string) (*objectstore.Object, error) { return nil, nil }, func(context.Context, string) error { @@ -105,12 +105,12 @@ func TestMigrationHandlerExecute(t *testing.T) { if err := dbConn.First(&migrated, upload.ID).Error; err != nil { t.Fatalf("First(upload) returned error: %v", err) } - current, err := storage.LoadConfig(ctx) + current, err := objectstore.LoadConfig(ctx) if err != nil { t.Fatalf("LoadConfig() returned error: %v", err) } - if current.Driver != storage.DriverS3 { - t.Errorf("active driver = %q, want %q", current.Driver, storage.DriverS3) + if current.Driver != objectstore.DriverS3 { + t.Errorf("active driver = %q, want %q", current.Driver, objectstore.DriverS3) } } @@ -134,22 +134,22 @@ func TestMigrationHandlerExecuteWithHashValidation(t *testing.T) { correctHash := hex.EncodeToString(h.Sum(nil)) ctx := context.Background() - active := storage.DefaultConfig() + active := objectstore.DefaultConfig() active.Local.Root = sourceRoot - if err := storage.SaveActiveConfig(ctx, active); err != nil { + if err := objectstore.SaveActiveConfig(ctx, active); err != nil { t.Fatalf("SaveActiveConfig() returned error: %v", err) } - target := storage.DefaultConfig() - target.Driver = storage.DriverS3 - target.S3 = storage.ObjectConfig{ + target := objectstore.DefaultConfig() + target.Driver = objectstore.DriverS3 + target.S3 = objectstore.ObjectConfig{ Region: "us-east-1", Bucket: "target", AccessKeyID: "key", SecretAccessKey: "secret", } payload, err := json.Marshal(struct { - Target storage.Config `json:"target"` + Target objectstore.Config `json:"target"` }{Target: target}) if err != nil { t.Fatalf("Marshal(storageMigrationPayload) returned error: %v", err) @@ -173,14 +173,14 @@ func TestMigrationHandlerExecuteWithHashValidation(t *testing.T) { } var copied bytes.Buffer - restore := storage.MockStorage( + restore := objectstore.MockStorage( func(_ context.Context, _ string, body io.Reader, _ int64, _ string) error { copied.Reset() _, err := io.Copy(&copied, body) return err }, - func(context.Context, string) (*storage.Object, error) { - return &storage.Object{ + func(context.Context, string) (*objectstore.Object, error) { + return &objectstore.Object{ Body: io.NopCloser(bytes.NewBuffer(copied.Bytes())), ContentLength: int64(copied.Len()), ContentType: "text/plain", @@ -253,13 +253,13 @@ func TestMigrationHandlerExecuteWithRedisLock(t *testing.T) { t.Fatalf("Failed to set manual lock in Redis: %v", err) } - active := storage.DefaultConfig() - if err := storage.SaveActiveConfig(ctx, active); err != nil { + active := objectstore.DefaultConfig() + if err := objectstore.SaveActiveConfig(ctx, active); err != nil { t.Fatalf("SaveActiveConfig() returned error: %v", err) } payload, err := json.Marshal(struct { - Target storage.Config `json:"target"` + Target objectstore.Config `json:"target"` }{Target: active}) if err != nil { t.Fatalf("Marshal payload failed: %v", err) diff --git a/internal/apps/upload/task/tasks.go b/internal/apps/upload/task/tasks.go index 59b1208f..7f69d9a5 100644 --- a/internal/apps/upload/task/tasks.go +++ b/internal/apps/upload/task/tasks.go @@ -14,9 +14,9 @@ import ( "github.com/Rain-kl/Wavelet/internal/apps/upload/filesrv" "github.com/Rain-kl/Wavelet/internal/apps/upload/shared" - "github.com/Rain-kl/Wavelet/internal/db" + "github.com/Rain-kl/Wavelet/internal/infra/persistence" + "github.com/Rain-kl/Wavelet/internal/infra/task" "github.com/Rain-kl/Wavelet/internal/model" - "github.com/Rain-kl/Wavelet/internal/task" ) const ( diff --git a/internal/apps/upload/task/tasks_test.go b/internal/apps/upload/task/tasks_test.go index 90572c8e..66737c01 100644 --- a/internal/apps/upload/task/tasks_test.go +++ b/internal/apps/upload/task/tasks_test.go @@ -19,11 +19,11 @@ import ( "github.com/Rain-kl/Wavelet/internal/apps/upload/filesrv" "github.com/Rain-kl/Wavelet/internal/apps/upload/shared" - "github.com/Rain-kl/Wavelet/internal/db" - "github.com/Rain-kl/Wavelet/internal/diskcache" + "github.com/Rain-kl/Wavelet/internal/infra/diskcache" + "github.com/Rain-kl/Wavelet/internal/infra/objectstore" + "github.com/Rain-kl/Wavelet/internal/infra/persistence" + "github.com/Rain-kl/Wavelet/internal/infra/task" "github.com/Rain-kl/Wavelet/internal/model" - "github.com/Rain-kl/Wavelet/internal/storage" - "github.com/Rain-kl/Wavelet/internal/task" "github.com/Rain-kl/Wavelet/internal/testhelper" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" @@ -34,17 +34,17 @@ func TestSystemCleanupHandler_Execute(t *testing.T) { defer cleanup() // Mock S3 存储（让 DeleteObject 总是成功） - storageMock := storage.MockStorage( + storageMock := objectstore.MockStorage( func(ctx context.Context, key string, body io.Reader, size int64, contentType string) error { return nil }, - func(ctx context.Context, key string) (*storage.Object, error) { return nil, nil }, + func(ctx context.Context, key string) (*objectstore.Object, error) { return nil, nil }, func(ctx context.Context, key string) error { return nil }, ) defer storageMock() - storage.IsEnabledFunc = func() bool { return true } - defer func() { storage.IsEnabledFunc = func() bool { return false } }() - storage.ResetCache() + objectstore.IsEnabledFunc = func() bool { return true } + defer func() { objectstore.IsEnabledFunc = func() bool { return false } }() + objectstore.ResetCache() ctx := context.Background() err := db.DB(ctx).AutoMigrate(&model.PushHistory{}) @@ -169,11 +169,11 @@ func TestSystemCleanupHandler_ExecuteNoFiles(t *testing.T) { defer cleanup() // Mock S3 存储 - storageMock := storage.MockStorage( + storageMock := objectstore.MockStorage( func(ctx context.Context, key string, body io.Reader, size int64, contentType string) error { return nil }, - func(ctx context.Context, key string) (*storage.Object, error) { return nil, nil }, + func(ctx context.Context, key string) (*objectstore.Object, error) { return nil, nil }, func(ctx context.Context, key string) error { return nil }, ) defer storageMock() @@ -267,9 +267,9 @@ func TestWarmImageCacheHandlerExecute(t *testing.T) { testDir := t.TempDir() ctx := context.Background() - active := storage.DefaultConfig() + active := objectstore.DefaultConfig() active.Local.Root = testDir - if err := storage.SaveActiveConfig(ctx, active); err != nil { + if err := objectstore.SaveActiveConfig(ctx, active); err != nil { t.Fatalf("SaveActiveConfig() returned error: %v", err) } diff --git a/internal/apps/user/access_tokens.go b/internal/apps/user/access_tokens.go index 647cfbca..047ea420 100644 --- a/internal/apps/user/access_tokens.go +++ b/internal/apps/user/access_tokens.go @@ -15,7 +15,7 @@ import ( "github.com/Rain-kl/Wavelet/internal/repository" "github.com/gin-gonic/gin" - "github.com/Rain-kl/Wavelet/internal/common/response" + "github.com/Rain-kl/Wavelet/internal/shared/response" ) type createTokenRequest struct { diff --git a/internal/apps/user/logics.go b/internal/apps/user/logics.go index a88c7c8e..74d1eea2 100644 --- a/internal/apps/user/logics.go +++ b/internal/apps/user/logics.go @@ -13,10 +13,10 @@ import ( "strings" "github.com/Rain-kl/Wavelet/internal/apps/oauth" - "github.com/Rain-kl/Wavelet/internal/db" + "github.com/Rain-kl/Wavelet/internal/infra/persistence" + "github.com/Rain-kl/Wavelet/internal/infra/task" "github.com/Rain-kl/Wavelet/internal/model" "github.com/Rain-kl/Wavelet/internal/repository" - "github.com/Rain-kl/Wavelet/internal/task" pkgu "github.com/Rain-kl/Wavelet/pkg/util" ) diff --git a/internal/apps/user/logics_test.go b/internal/apps/user/logics_test.go index fd8de420..f5ee503a 100644 --- a/internal/apps/user/logics_test.go +++ b/internal/apps/user/logics_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - "github.com/Rain-kl/Wavelet/internal/db" + "github.com/Rain-kl/Wavelet/internal/infra/persistence" "github.com/Rain-kl/Wavelet/internal/model" "github.com/Rain-kl/Wavelet/internal/repository" "github.com/Rain-kl/Wavelet/internal/testhelper" diff --git a/internal/apps/user/routers.go b/internal/apps/user/routers.go index d2aa9a42..3f602553 100644 --- a/internal/apps/user/routers.go +++ b/internal/apps/user/routers.go @@ -10,13 +10,13 @@ import ( "time" "github.com/Rain-kl/Wavelet/internal/apps/oauth" - "github.com/Rain-kl/Wavelet/internal/common" - "github.com/Rain-kl/Wavelet/internal/common/response" - "github.com/Rain-kl/Wavelet/internal/config" - "github.com/Rain-kl/Wavelet/internal/db/idgen" + "github.com/Rain-kl/Wavelet/internal/infra/config" + "github.com/Rain-kl/Wavelet/internal/infra/persistence/idgen" "github.com/Rain-kl/Wavelet/internal/listener" "github.com/Rain-kl/Wavelet/internal/model" "github.com/Rain-kl/Wavelet/internal/repository" + "github.com/Rain-kl/Wavelet/internal/shared" + "github.com/Rain-kl/Wavelet/internal/shared/response" "github.com/Rain-kl/Wavelet/pkg/logger" "github.com/gin-contrib/sessions" "github.com/gin-gonic/gin" @@ -124,7 +124,7 @@ func Login(c *gin.Context) { } if !user.IsActive { logger.WarnF(ctx, "[LoginAudit] banned user login attempt for username: %s, ID: %d, IP: %s", user.Username, user.ID, c.ClientIP()) - response.AbortBadRequest(c, common.BannedAccount) + response.AbortBadRequest(c, shared.BannedAccount) return } diff --git a/internal/apps/user/routers_test.go b/internal/apps/user/routers_test.go index 79828c8d..873ac5e4 100644 --- a/internal/apps/user/routers_test.go +++ b/internal/apps/user/routers_test.go @@ -14,8 +14,8 @@ import ( "time" "github.com/Rain-kl/Wavelet/internal/apps/oauth" - "github.com/Rain-kl/Wavelet/internal/config" - "github.com/Rain-kl/Wavelet/internal/db" + "github.com/Rain-kl/Wavelet/internal/infra/config" + "github.com/Rain-kl/Wavelet/internal/infra/persistence" "github.com/Rain-kl/Wavelet/internal/model" "github.com/Rain-kl/Wavelet/internal/repository" "github.com/Rain-kl/Wavelet/internal/testhelper" @@ -23,7 +23,7 @@ import ( "github.com/gin-contrib/sessions/cookie" "github.com/gin-gonic/gin" - "github.com/Rain-kl/Wavelet/internal/common/response" + "github.com/Rain-kl/Wavelet/internal/shared/response" ) func setupUserTestRouter(t *testing.T) *gin.Engine { diff --git a/internal/apps/user/tasks.go b/internal/apps/user/tasks.go index 01d9796c..167854a6 100644 --- a/internal/apps/user/tasks.go +++ b/internal/apps/user/tasks.go @@ -11,9 +11,9 @@ import ( "strconv" "strings" + "github.com/Rain-kl/Wavelet/internal/infra/task" "github.com/Rain-kl/Wavelet/internal/model" "github.com/Rain-kl/Wavelet/internal/repository" - "github.com/Rain-kl/Wavelet/internal/task" "github.com/Rain-kl/Wavelet/pkg/mail" ) diff --git a/internal/cmd/all.go b/internal/cmd/all.go index 06f35f76..db7f0799 100644 --- a/internal/cmd/all.go +++ b/internal/cmd/all.go @@ -9,10 +9,10 @@ import ( "log" "sync" - "github.com/Rain-kl/Wavelet/internal/bootstrap" + "github.com/Rain-kl/Wavelet/internal/infra/task/scheduler" + "github.com/Rain-kl/Wavelet/internal/infra/task/worker" + "github.com/Rain-kl/Wavelet/internal/platform/bootstrap" "github.com/Rain-kl/Wavelet/internal/router" - "github.com/Rain-kl/Wavelet/internal/task/scheduler" - "github.com/Rain-kl/Wavelet/internal/task/worker" "github.com/spf13/cobra" ) diff --git a/internal/cmd/api.go b/internal/cmd/api.go index 86604d08..1562cdf1 100644 --- a/internal/cmd/api.go +++ b/internal/cmd/api.go @@ -5,7 +5,7 @@ package cmd import ( - "github.com/Rain-kl/Wavelet/internal/bootstrap" + "github.com/Rain-kl/Wavelet/internal/platform/bootstrap" "github.com/Rain-kl/Wavelet/internal/router" "github.com/spf13/cobra" ) diff --git a/internal/cmd/banner.go b/internal/cmd/banner.go index dd9e45ad..15d8f990 100644 --- a/internal/cmd/banner.go +++ b/internal/cmd/banner.go @@ -10,8 +10,8 @@ import ( "strings" "github.com/Rain-kl/Wavelet/internal/buildinfo" - "github.com/Rain-kl/Wavelet/internal/config" - "github.com/Rain-kl/Wavelet/internal/db/migrator" + "github.com/Rain-kl/Wavelet/internal/infra/config" + "github.com/Rain-kl/Wavelet/internal/infra/persistence/migrator" ) type startupState struct { diff --git a/internal/cmd/banner_test.go b/internal/cmd/banner_test.go index 8703c51a..48b54165 100644 --- a/internal/cmd/banner_test.go +++ b/internal/cmd/banner_test.go @@ -8,8 +8,8 @@ import ( "testing" "github.com/Rain-kl/Wavelet/internal/buildinfo" - "github.com/Rain-kl/Wavelet/internal/config" - "github.com/Rain-kl/Wavelet/internal/db/migrator" + "github.com/Rain-kl/Wavelet/internal/infra/config" + "github.com/Rain-kl/Wavelet/internal/infra/persistence/migrator" ) func TestFormatStartupBanner(t *testing.T) { diff --git a/internal/cmd/bootstrap.go b/internal/cmd/bootstrap.go index 423aa461..2460cdaf 100644 --- a/internal/cmd/bootstrap.go +++ b/internal/cmd/bootstrap.go @@ -6,7 +6,7 @@ package cmd import ( "context" - "github.com/Rain-kl/Wavelet/internal/bootstrap" + "github.com/Rain-kl/Wavelet/internal/platform/bootstrap" "github.com/Rain-kl/Wavelet/pkg/trace" ) diff --git a/internal/cmd/reset_passwd.go b/internal/cmd/reset_passwd.go index 68b4ce74..61dc9903 100644 --- a/internal/cmd/reset_passwd.go +++ b/internal/cmd/reset_passwd.go @@ -14,10 +14,10 @@ import ( "strings" "github.com/Rain-kl/Wavelet/internal/apps/oauth" - "github.com/Rain-kl/Wavelet/internal/bootstrap" - "github.com/Rain-kl/Wavelet/internal/db" - "github.com/Rain-kl/Wavelet/internal/db/migrator" + "github.com/Rain-kl/Wavelet/internal/infra/persistence" + "github.com/Rain-kl/Wavelet/internal/infra/persistence/migrator" "github.com/Rain-kl/Wavelet/internal/model" + "github.com/Rain-kl/Wavelet/internal/platform/bootstrap" "github.com/Rain-kl/Wavelet/internal/repository" "github.com/spf13/cobra" "gorm.io/gorm" diff --git a/internal/cmd/root.go b/internal/cmd/root.go index c798d5af..d30ea4b7 100644 --- a/internal/cmd/root.go +++ b/internal/cmd/root.go @@ -10,8 +10,8 @@ import ( "time" "github.com/Rain-kl/Wavelet/internal/buildinfo" - "github.com/Rain-kl/Wavelet/internal/config" - "github.com/Rain-kl/Wavelet/internal/db/migrator" + "github.com/Rain-kl/Wavelet/internal/infra/config" + "github.com/Rain-kl/Wavelet/internal/infra/persistence/migrator" "github.com/Rain-kl/Wavelet/pkg/logger" "github.com/Rain-kl/Wavelet/pkg/trace" "github.com/spf13/cobra" diff --git a/internal/cmd/scheduler.go b/internal/cmd/scheduler.go index f3ad56c4..75f0a022 100644 --- a/internal/cmd/scheduler.go +++ b/internal/cmd/scheduler.go @@ -7,8 +7,8 @@ package cmd import ( "log" - "github.com/Rain-kl/Wavelet/internal/bootstrap" - "github.com/Rain-kl/Wavelet/internal/task/scheduler" + "github.com/Rain-kl/Wavelet/internal/infra/task/scheduler" + "github.com/Rain-kl/Wavelet/internal/platform/bootstrap" "github.com/spf13/cobra" ) diff --git a/internal/cmd/worker.go b/internal/cmd/worker.go index 65705a37..0c4d42be 100644 --- a/internal/cmd/worker.go +++ b/internal/cmd/worker.go @@ -7,8 +7,8 @@ package cmd import ( "log" - "github.com/Rain-kl/Wavelet/internal/bootstrap" - "github.com/Rain-kl/Wavelet/internal/task/worker" + "github.com/Rain-kl/Wavelet/internal/infra/task/worker" + "github.com/Rain-kl/Wavelet/internal/platform/bootstrap" "github.com/spf13/cobra" ) diff --git a/internal/common/constants.go b/internal/common/constants.go deleted file mode 100644 index f317898a..00000000 --- a/internal/common/constants.go +++ /dev/null @@ -1,6 +0,0 @@ -// Copyright 2025 linux.do -// Copyright 2026 Arctel.net -// SPDX-License-Identifier: Apache-2.0 - -// Package common 提供跨模块共享的常量、错误定义和通用工具函数。 -package common diff --git a/internal/config/config.go b/internal/infra/config/config.go similarity index 100% rename from internal/config/config.go rename to internal/infra/config/config.go diff --git a/internal/config/config_test.go b/internal/infra/config/config_test.go similarity index 100% rename from internal/config/config_test.go rename to internal/infra/config/config_test.go diff --git a/internal/config/model.go b/internal/infra/config/model.go similarity index 100% rename from internal/config/model.go rename to internal/infra/config/model.go diff --git a/internal/diskcache/cache.go b/internal/infra/diskcache/cache.go similarity index 98% rename from internal/diskcache/cache.go rename to internal/infra/diskcache/cache.go index c52bfaee..e387e7c9 100644 --- a/internal/diskcache/cache.go +++ b/internal/infra/diskcache/cache.go @@ -10,7 +10,7 @@ import ( "sync" "time" - "github.com/Rain-kl/Wavelet/internal/db" + "github.com/Rain-kl/Wavelet/internal/infra/persistence" "github.com/Rain-kl/Wavelet/internal/model" "github.com/Rain-kl/Wavelet/internal/repository" pkgcache "github.com/Rain-kl/Wavelet/pkg/cache/disk" diff --git a/internal/diskcache/cache_test.go b/internal/infra/diskcache/cache_test.go similarity index 96% rename from internal/diskcache/cache_test.go rename to internal/infra/diskcache/cache_test.go index c995f989..68221d75 100644 --- a/internal/diskcache/cache_test.go +++ b/internal/infra/diskcache/cache_test.go @@ -8,7 +8,7 @@ import ( "os" "testing" - "github.com/Rain-kl/Wavelet/internal/db" + "github.com/Rain-kl/Wavelet/internal/infra/persistence" "github.com/Rain-kl/Wavelet/internal/model" "github.com/Rain-kl/Wavelet/internal/repository" "github.com/Rain-kl/Wavelet/internal/testhelper" diff --git a/internal/storage/config.go b/internal/infra/objectstore/config.go similarity index 97% rename from internal/storage/config.go rename to internal/infra/objectstore/config.go index 2fe84811..5cd1dc8d 100644 --- a/internal/storage/config.go +++ b/internal/infra/objectstore/config.go @@ -1,8 +1,8 @@ // Copyright 2026 Arctel.net // SPDX-License-Identifier: Apache-2.0 -// Package storage provides dynamically configured file storage backends. -package storage +// Package objectstore provides dynamically configured file storage backends. +package objectstore import ( "context" @@ -12,7 +12,7 @@ import ( "strings" "time" - "github.com/Rain-kl/Wavelet/internal/db" + "github.com/Rain-kl/Wavelet/internal/infra/persistence" "github.com/Rain-kl/Wavelet/internal/model" "github.com/Rain-kl/Wavelet/internal/repository" "gorm.io/gorm" diff --git a/internal/storage/http.go b/internal/infra/objectstore/http.go similarity index 98% rename from internal/storage/http.go rename to internal/infra/objectstore/http.go index f901ce7b..fe6698e2 100644 --- a/internal/storage/http.go +++ b/internal/infra/objectstore/http.go @@ -1,7 +1,7 @@ // Copyright 2026 Arctel.net // SPDX-License-Identifier: Apache-2.0 -package storage +package objectstore import ( "context" diff --git a/internal/storage/local.go b/internal/infra/objectstore/local.go similarity index 99% rename from internal/storage/local.go rename to internal/infra/objectstore/local.go index 29591df7..3e172116 100644 --- a/internal/storage/local.go +++ b/internal/infra/objectstore/local.go @@ -1,7 +1,7 @@ // Copyright 2026 Arctel.net // SPDX-License-Identifier: Apache-2.0 -package storage +package objectstore import ( "context" diff --git a/internal/storage/local_test.go b/internal/infra/objectstore/local_test.go similarity index 98% rename from internal/storage/local_test.go rename to internal/infra/objectstore/local_test.go index d8374543..8525f078 100644 --- a/internal/storage/local_test.go +++ b/internal/infra/objectstore/local_test.go @@ -1,7 +1,7 @@ // Copyright 2026 Arctel.net // SPDX-License-Identifier: Apache-2.0 -package storage +package objectstore import ( "bytes" diff --git a/internal/storage/oss.go b/internal/infra/objectstore/oss.go similarity index 99% rename from internal/storage/oss.go rename to internal/infra/objectstore/oss.go index 9b4aea2b..356d14ef 100644 --- a/internal/storage/oss.go +++ b/internal/infra/objectstore/oss.go @@ -1,7 +1,7 @@ // Copyright 2026 Arctel.net // SPDX-License-Identifier: Apache-2.0 -package storage +package objectstore import ( "context" diff --git a/internal/storage/s3.go b/internal/infra/objectstore/s3.go similarity index 99% rename from internal/storage/s3.go rename to internal/infra/objectstore/s3.go index 3203ee69..a314be48 100644 --- a/internal/storage/s3.go +++ b/internal/infra/objectstore/s3.go @@ -1,7 +1,7 @@ // Copyright 2026 Arctel.net // SPDX-License-Identifier: Apache-2.0 -package storage +package objectstore import ( "context" diff --git a/internal/storage/storage.go b/internal/infra/objectstore/storage.go similarity index 98% rename from internal/storage/storage.go rename to internal/infra/objectstore/storage.go index 26a2560d..720c05cb 100644 --- a/internal/storage/storage.go +++ b/internal/infra/objectstore/storage.go @@ -1,7 +1,7 @@ // Copyright 2026 Arctel.net // SPDX-License-Identifier: Apache-2.0 -package storage +package objectstore import ( "context" @@ -13,7 +13,7 @@ import ( "sync" "time" - "github.com/Rain-kl/Wavelet/internal/db" + "github.com/Rain-kl/Wavelet/internal/infra/persistence" "github.com/Rain-kl/Wavelet/internal/model" "github.com/Rain-kl/Wavelet/internal/repository" "gorm.io/gorm" diff --git a/internal/storage/storage_test.go b/internal/infra/objectstore/storage_test.go similarity index 97% rename from internal/storage/storage_test.go rename to internal/infra/objectstore/storage_test.go index 59a1dfec..1ea43ec0 100644 --- a/internal/storage/storage_test.go +++ b/internal/infra/objectstore/storage_test.go @@ -1,7 +1,7 @@ // Copyright 2026 Arctel.net // SPDX-License-Identifier: Apache-2.0 -package storage +package objectstore import ( "context" @@ -11,7 +11,7 @@ import ( "testing" "time" - "github.com/Rain-kl/Wavelet/internal/db" + "github.com/Rain-kl/Wavelet/internal/infra/persistence" "github.com/alicebob/miniredis/v2" "github.com/redis/go-redis/v9" ) diff --git a/internal/storage/webdav.go b/internal/infra/objectstore/webdav.go similarity index 99% rename from internal/storage/webdav.go rename to internal/infra/objectstore/webdav.go index 5e080e66..5d8e3e65 100644 --- a/internal/storage/webdav.go +++ b/internal/infra/objectstore/webdav.go @@ -1,7 +1,7 @@ // Copyright 2026 Arctel.net // SPDX-License-Identifier: Apache-2.0 -package storage +package objectstore import ( "context" diff --git a/internal/db/batchwriter/config.go b/internal/infra/persistence/batchwriter/config.go similarity index 100% rename from internal/db/batchwriter/config.go rename to internal/infra/persistence/batchwriter/config.go diff --git a/internal/db/batchwriter/errs.go b/internal/infra/persistence/batchwriter/errs.go similarity index 100% rename from internal/db/batchwriter/errs.go rename to internal/infra/persistence/batchwriter/errs.go diff --git a/internal/db/batchwriter/writer.go b/internal/infra/persistence/batchwriter/writer.go similarity index 100% rename from internal/db/batchwriter/writer.go rename to internal/infra/persistence/batchwriter/writer.go diff --git a/internal/db/batchwriter/writer_test.go b/internal/infra/persistence/batchwriter/writer_test.go similarity index 100% rename from internal/db/batchwriter/writer_test.go rename to internal/infra/persistence/batchwriter/writer_test.go diff --git a/internal/db/clickhouse.go b/internal/infra/persistence/clickhouse.go similarity index 98% rename from internal/db/clickhouse.go rename to internal/infra/persistence/clickhouse.go index c6aea6e0..63fa3ecb 100644 --- a/internal/db/clickhouse.go +++ b/internal/infra/persistence/clickhouse.go @@ -16,7 +16,7 @@ import ( "github.com/ClickHouse/clickhouse-go/v2" "github.com/ClickHouse/clickhouse-go/v2/lib/driver" - "github.com/Rain-kl/Wavelet/internal/config" + "github.com/Rain-kl/Wavelet/internal/infra/config" "go.opentelemetry.io/otel/attribute" clickhouseDriver "gorm.io/driver/clickhouse" "gorm.io/gorm" diff --git a/internal/db/errs.go b/internal/infra/persistence/errs.go similarity index 100% rename from internal/db/errs.go rename to internal/infra/persistence/errs.go diff --git a/internal/db/idgen/snowflake.go b/internal/infra/persistence/idgen/snowflake.go similarity index 95% rename from internal/db/idgen/snowflake.go rename to internal/infra/persistence/idgen/snowflake.go index 98bef8bb..e828a578 100644 --- a/internal/db/idgen/snowflake.go +++ b/internal/infra/persistence/idgen/snowflake.go @@ -9,7 +9,7 @@ import ( "fmt" "log" - "github.com/Rain-kl/Wavelet/internal/config" + "github.com/Rain-kl/Wavelet/internal/infra/config" "github.com/bwmarrin/snowflake" ) diff --git a/internal/db/idgen/snowflake_test.go b/internal/infra/persistence/idgen/snowflake_test.go similarity index 100% rename from internal/db/idgen/snowflake_test.go rename to internal/infra/persistence/idgen/snowflake_test.go diff --git a/internal/db/migrator/clickhouse.go b/internal/infra/persistence/migrator/clickhouse.go similarity index 98% rename from internal/db/migrator/clickhouse.go rename to internal/infra/persistence/migrator/clickhouse.go index 78fa8cf8..170034fd 100644 --- a/internal/db/migrator/clickhouse.go +++ b/internal/infra/persistence/migrator/clickhouse.go @@ -13,7 +13,7 @@ import ( "time" "github.com/ClickHouse/clickhouse-go/v2" - "github.com/Rain-kl/Wavelet/internal/config" + "github.com/Rain-kl/Wavelet/internal/infra/config" "github.com/pressly/goose/v3" ) diff --git a/internal/db/migrator/clickhouse_test.go b/internal/infra/persistence/migrator/clickhouse_test.go similarity index 95% rename from internal/db/migrator/clickhouse_test.go rename to internal/infra/persistence/migrator/clickhouse_test.go index abb3d0ce..c332c4d3 100644 --- a/internal/db/migrator/clickhouse_test.go +++ b/internal/infra/persistence/migrator/clickhouse_test.go @@ -6,7 +6,7 @@ package migrator import ( "testing" - "github.com/Rain-kl/Wavelet/internal/config" + "github.com/Rain-kl/Wavelet/internal/infra/config" "github.com/pressly/goose/v3" ) diff --git a/internal/db/migrator/goose/clickhouse/202606190001_create_user_access_logs.sql b/internal/infra/persistence/migrator/goose/clickhouse/202606190001_create_user_access_logs.sql similarity index 100% rename from internal/db/migrator/goose/clickhouse/202606190001_create_user_access_logs.sql rename to internal/infra/persistence/migrator/goose/clickhouse/202606190001_create_user_access_logs.sql diff --git a/internal/db/migrator/goose/postgres/202606090001_initial_schema.sql b/internal/infra/persistence/migrator/goose/postgres/202606090001_initial_schema.sql similarity index 100% rename from internal/db/migrator/goose/postgres/202606090001_initial_schema.sql rename to internal/infra/persistence/migrator/goose/postgres/202606090001_initial_schema.sql diff --git a/internal/db/migrator/goose/postgres/202606100001_create_schedules.sql b/internal/infra/persistence/migrator/goose/postgres/202606100001_create_schedules.sql similarity index 100% rename from internal/db/migrator/goose/postgres/202606100001_create_schedules.sql rename to internal/infra/persistence/migrator/goose/postgres/202606100001_create_schedules.sql diff --git a/internal/db/migrator/goose/postgres/202606100002_access_token_is_admin.sql b/internal/infra/persistence/migrator/goose/postgres/202606100002_access_token_is_admin.sql similarity index 100% rename from internal/db/migrator/goose/postgres/202606100002_access_token_is_admin.sql rename to internal/infra/persistence/migrator/goose/postgres/202606100002_access_token_is_admin.sql diff --git a/internal/db/migrator/goose/postgres/202606110001_remove_access_token_last_used_at.sql b/internal/infra/persistence/migrator/goose/postgres/202606110001_remove_access_token_last_used_at.sql similarity index 100% rename from internal/db/migrator/goose/postgres/202606110001_remove_access_token_last_used_at.sql rename to internal/infra/persistence/migrator/goose/postgres/202606110001_remove_access_token_last_used_at.sql diff --git a/internal/db/migrator/goose/postgres/202606110002_alter_schedules_id_auto_increment.sql b/internal/infra/persistence/migrator/goose/postgres/202606110002_alter_schedules_id_auto_increment.sql similarity index 100% rename from internal/db/migrator/goose/postgres/202606110002_alter_schedules_id_auto_increment.sql rename to internal/infra/persistence/migrator/goose/postgres/202606110002_alter_schedules_id_auto_increment.sql diff --git a/internal/db/migrator/goose/postgres/202606110003_rename_tables_to_w_prefix.sql b/internal/infra/persistence/migrator/goose/postgres/202606110003_rename_tables_to_w_prefix.sql similarity index 100% rename from internal/db/migrator/goose/postgres/202606110003_rename_tables_to_w_prefix.sql rename to internal/infra/persistence/migrator/goose/postgres/202606110003_rename_tables_to_w_prefix.sql diff --git a/internal/db/migrator/goose/postgres/202606110004_add_file_access_whitelist_config.sql b/internal/infra/persistence/migrator/goose/postgres/202606110004_add_file_access_whitelist_config.sql similarity index 100% rename from internal/db/migrator/goose/postgres/202606110004_add_file_access_whitelist_config.sql rename to internal/infra/persistence/migrator/goose/postgres/202606110004_add_file_access_whitelist_config.sql diff --git a/internal/db/migrator/goose/postgres/202606110005_add_disk_cache_configs.sql b/internal/infra/persistence/migrator/goose/postgres/202606110005_add_disk_cache_configs.sql similarity index 100% rename from internal/db/migrator/goose/postgres/202606110005_add_disk_cache_configs.sql rename to internal/infra/persistence/migrator/goose/postgres/202606110005_add_disk_cache_configs.sql diff --git a/internal/db/migrator/goose/postgres/202606120001_add_login_session_ttl_config.sql b/internal/infra/persistence/migrator/goose/postgres/202606120001_add_login_session_ttl_config.sql similarity index 100% rename from internal/db/migrator/goose/postgres/202606120001_add_login_session_ttl_config.sql rename to internal/infra/persistence/migrator/goose/postgres/202606120001_add_login_session_ttl_config.sql diff --git a/internal/db/migrator/goose/postgres/202606120002_add_update_upstream_repository_config.sql b/internal/infra/persistence/migrator/goose/postgres/202606120002_add_update_upstream_repository_config.sql similarity index 100% rename from internal/db/migrator/goose/postgres/202606120002_add_update_upstream_repository_config.sql rename to internal/infra/persistence/migrator/goose/postgres/202606120002_add_update_upstream_repository_config.sql diff --git a/internal/db/migrator/goose/postgres/202606130001_add_upload_access_mode.sql b/internal/infra/persistence/migrator/goose/postgres/202606130001_add_upload_access_mode.sql similarity index 100% rename from internal/db/migrator/goose/postgres/202606130001_add_upload_access_mode.sql rename to internal/infra/persistence/migrator/goose/postgres/202606130001_add_upload_access_mode.sql diff --git a/internal/db/migrator/goose/postgres/202606130002_expand_system_config_value.sql b/internal/infra/persistence/migrator/goose/postgres/202606130002_expand_system_config_value.sql similarity index 100% rename from internal/db/migrator/goose/postgres/202606130002_expand_system_config_value.sql rename to internal/infra/persistence/migrator/goose/postgres/202606130002_expand_system_config_value.sql diff --git a/internal/db/migrator/goose/postgres/202606130003_add_storage_config.sql b/internal/infra/persistence/migrator/goose/postgres/202606130003_add_storage_config.sql similarity index 100% rename from internal/db/migrator/goose/postgres/202606130003_add_storage_config.sql rename to internal/infra/persistence/migrator/goose/postgres/202606130003_add_storage_config.sql diff --git a/internal/db/migrator/goose/postgres/202606140001_create_push_tables.sql b/internal/infra/persistence/migrator/goose/postgres/202606140001_create_push_tables.sql similarity index 100% rename from internal/db/migrator/goose/postgres/202606140001_create_push_tables.sql rename to internal/infra/persistence/migrator/goose/postgres/202606140001_create_push_tables.sql diff --git a/internal/db/migrator/goose/postgres/202606140003_add_system_user.sql b/internal/infra/persistence/migrator/goose/postgres/202606140003_add_system_user.sql similarity index 100% rename from internal/db/migrator/goose/postgres/202606140003_add_system_user.sql rename to internal/infra/persistence/migrator/goose/postgres/202606140003_add_system_user.sql diff --git a/internal/db/migrator/goose/postgres/202606140004_create_push_channels.sql b/internal/infra/persistence/migrator/goose/postgres/202606140004_create_push_channels.sql similarity index 100% rename from internal/db/migrator/goose/postgres/202606140004_create_push_channels.sql rename to internal/infra/persistence/migrator/goose/postgres/202606140004_create_push_channels.sql diff --git a/internal/db/migrator/goose/postgres/202606140005_update_system_cleanup_schedule.sql b/internal/infra/persistence/migrator/goose/postgres/202606140005_update_system_cleanup_schedule.sql similarity index 100% rename from internal/db/migrator/goose/postgres/202606140005_update_system_cleanup_schedule.sql rename to internal/infra/persistence/migrator/goose/postgres/202606140005_update_system_cleanup_schedule.sql diff --git a/internal/db/migrator/goose/postgres/202606150001_add_task_type_to_push_events.sql b/internal/infra/persistence/migrator/goose/postgres/202606150001_add_task_type_to_push_events.sql similarity index 100% rename from internal/db/migrator/goose/postgres/202606150001_add_task_type_to_push_events.sql rename to internal/infra/persistence/migrator/goose/postgres/202606150001_add_task_type_to_push_events.sql diff --git a/internal/db/migrator/goose/postgres/202606160001_remove_push_config.sql b/internal/infra/persistence/migrator/goose/postgres/202606160001_remove_push_config.sql similarity index 100% rename from internal/db/migrator/goose/postgres/202606160001_remove_push_config.sql rename to internal/infra/persistence/migrator/goose/postgres/202606160001_remove_push_config.sql diff --git a/internal/db/migrator/goose/postgres/202606170001_add_upload_composite_indexes.sql b/internal/infra/persistence/migrator/goose/postgres/202606170001_add_upload_composite_indexes.sql similarity index 100% rename from internal/db/migrator/goose/postgres/202606170001_add_upload_composite_indexes.sql rename to internal/infra/persistence/migrator/goose/postgres/202606170001_add_upload_composite_indexes.sql diff --git a/internal/db/migrator/goose/postgres/202606170002_create_upload_stats_table.sql b/internal/infra/persistence/migrator/goose/postgres/202606170002_create_upload_stats_table.sql similarity index 100% rename from internal/db/migrator/goose/postgres/202606170002_create_upload_stats_table.sql rename to internal/infra/persistence/migrator/goose/postgres/202606170002_create_upload_stats_table.sql diff --git a/internal/db/migrator/goose/postgres/202606170003_backfill_upload_stats.sql b/internal/infra/persistence/migrator/goose/postgres/202606170003_backfill_upload_stats.sql similarity index 100% rename from internal/db/migrator/goose/postgres/202606170003_backfill_upload_stats.sql rename to internal/infra/persistence/migrator/goose/postgres/202606170003_backfill_upload_stats.sql diff --git a/internal/db/migrator/goose/postgres/202606180001_drop_upload_storage_driver.sql b/internal/infra/persistence/migrator/goose/postgres/202606180001_drop_upload_storage_driver.sql similarity index 100% rename from internal/db/migrator/goose/postgres/202606180001_drop_upload_storage_driver.sql rename to internal/infra/persistence/migrator/goose/postgres/202606180001_drop_upload_storage_driver.sql diff --git a/internal/db/migrator/goose/sqlite/202606090001_initial_schema.sql b/internal/infra/persistence/migrator/goose/sqlite/202606090001_initial_schema.sql similarity index 100% rename from internal/db/migrator/goose/sqlite/202606090001_initial_schema.sql rename to internal/infra/persistence/migrator/goose/sqlite/202606090001_initial_schema.sql diff --git a/internal/db/migrator/goose/sqlite/202606100001_create_schedules.sql b/internal/infra/persistence/migrator/goose/sqlite/202606100001_create_schedules.sql similarity index 100% rename from internal/db/migrator/goose/sqlite/202606100001_create_schedules.sql rename to internal/infra/persistence/migrator/goose/sqlite/202606100001_create_schedules.sql diff --git a/internal/db/migrator/goose/sqlite/202606100002_access_token_is_admin.sql b/internal/infra/persistence/migrator/goose/sqlite/202606100002_access_token_is_admin.sql similarity index 100% rename from internal/db/migrator/goose/sqlite/202606100002_access_token_is_admin.sql rename to internal/infra/persistence/migrator/goose/sqlite/202606100002_access_token_is_admin.sql diff --git a/internal/db/migrator/goose/sqlite/202606110001_remove_access_token_last_used_at.sql b/internal/infra/persistence/migrator/goose/sqlite/202606110001_remove_access_token_last_used_at.sql similarity index 100% rename from internal/db/migrator/goose/sqlite/202606110001_remove_access_token_last_used_at.sql rename to internal/infra/persistence/migrator/goose/sqlite/202606110001_remove_access_token_last_used_at.sql diff --git a/internal/db/migrator/goose/sqlite/202606110002_alter_schedules_id_auto_increment.sql b/internal/infra/persistence/migrator/goose/sqlite/202606110002_alter_schedules_id_auto_increment.sql similarity index 100% rename from internal/db/migrator/goose/sqlite/202606110002_alter_schedules_id_auto_increment.sql rename to internal/infra/persistence/migrator/goose/sqlite/202606110002_alter_schedules_id_auto_increment.sql diff --git a/internal/db/migrator/goose/sqlite/202606110003_rename_tables_to_w_prefix.sql b/internal/infra/persistence/migrator/goose/sqlite/202606110003_rename_tables_to_w_prefix.sql similarity index 100% rename from internal/db/migrator/goose/sqlite/202606110003_rename_tables_to_w_prefix.sql rename to internal/infra/persistence/migrator/goose/sqlite/202606110003_rename_tables_to_w_prefix.sql diff --git a/internal/db/migrator/goose/sqlite/202606110004_add_file_access_whitelist_config.sql b/internal/infra/persistence/migrator/goose/sqlite/202606110004_add_file_access_whitelist_config.sql similarity index 100% rename from internal/db/migrator/goose/sqlite/202606110004_add_file_access_whitelist_config.sql rename to internal/infra/persistence/migrator/goose/sqlite/202606110004_add_file_access_whitelist_config.sql diff --git a/internal/db/migrator/goose/sqlite/202606110005_add_disk_cache_configs.sql b/internal/infra/persistence/migrator/goose/sqlite/202606110005_add_disk_cache_configs.sql similarity index 100% rename from internal/db/migrator/goose/sqlite/202606110005_add_disk_cache_configs.sql rename to internal/infra/persistence/migrator/goose/sqlite/202606110005_add_disk_cache_configs.sql diff --git a/internal/db/migrator/goose/sqlite/202606120001_add_login_session_ttl_config.sql b/internal/infra/persistence/migrator/goose/sqlite/202606120001_add_login_session_ttl_config.sql similarity index 100% rename from internal/db/migrator/goose/sqlite/202606120001_add_login_session_ttl_config.sql rename to internal/infra/persistence/migrator/goose/sqlite/202606120001_add_login_session_ttl_config.sql diff --git a/internal/db/migrator/goose/sqlite/202606120002_add_update_upstream_repository_config.sql b/internal/infra/persistence/migrator/goose/sqlite/202606120002_add_update_upstream_repository_config.sql similarity index 100% rename from internal/db/migrator/goose/sqlite/202606120002_add_update_upstream_repository_config.sql rename to internal/infra/persistence/migrator/goose/sqlite/202606120002_add_update_upstream_repository_config.sql diff --git a/internal/db/migrator/goose/sqlite/202606130001_add_upload_access_mode.sql b/internal/infra/persistence/migrator/goose/sqlite/202606130001_add_upload_access_mode.sql similarity index 100% rename from internal/db/migrator/goose/sqlite/202606130001_add_upload_access_mode.sql rename to internal/infra/persistence/migrator/goose/sqlite/202606130001_add_upload_access_mode.sql diff --git a/internal/db/migrator/goose/sqlite/202606130002_expand_system_config_value.sql b/internal/infra/persistence/migrator/goose/sqlite/202606130002_expand_system_config_value.sql similarity index 100% rename from internal/db/migrator/goose/sqlite/202606130002_expand_system_config_value.sql rename to internal/infra/persistence/migrator/goose/sqlite/202606130002_expand_system_config_value.sql diff --git a/internal/db/migrator/goose/sqlite/202606130003_add_storage_config.sql b/internal/infra/persistence/migrator/goose/sqlite/202606130003_add_storage_config.sql similarity index 100% rename from internal/db/migrator/goose/sqlite/202606130003_add_storage_config.sql rename to internal/infra/persistence/migrator/goose/sqlite/202606130003_add_storage_config.sql diff --git a/internal/db/migrator/goose/sqlite/202606140001_create_push_tables.sql b/internal/infra/persistence/migrator/goose/sqlite/202606140001_create_push_tables.sql similarity index 100% rename from internal/db/migrator/goose/sqlite/202606140001_create_push_tables.sql rename to internal/infra/persistence/migrator/goose/sqlite/202606140001_create_push_tables.sql diff --git a/internal/db/migrator/goose/sqlite/202606140003_add_system_user.sql b/internal/infra/persistence/migrator/goose/sqlite/202606140003_add_system_user.sql similarity index 100% rename from internal/db/migrator/goose/sqlite/202606140003_add_system_user.sql rename to internal/infra/persistence/migrator/goose/sqlite/202606140003_add_system_user.sql diff --git a/internal/db/migrator/goose/sqlite/202606140004_create_push_channels.sql b/internal/infra/persistence/migrator/goose/sqlite/202606140004_create_push_channels.sql similarity index 100% rename from internal/db/migrator/goose/sqlite/202606140004_create_push_channels.sql rename to internal/infra/persistence/migrator/goose/sqlite/202606140004_create_push_channels.sql diff --git a/internal/db/migrator/goose/sqlite/202606140005_update_system_cleanup_schedule.sql b/internal/infra/persistence/migrator/goose/sqlite/202606140005_update_system_cleanup_schedule.sql similarity index 100% rename from internal/db/migrator/goose/sqlite/202606140005_update_system_cleanup_schedule.sql rename to internal/infra/persistence/migrator/goose/sqlite/202606140005_update_system_cleanup_schedule.sql diff --git a/internal/db/migrator/goose/sqlite/202606150001_add_task_type_to_push_events.sql b/internal/infra/persistence/migrator/goose/sqlite/202606150001_add_task_type_to_push_events.sql similarity index 100% rename from internal/db/migrator/goose/sqlite/202606150001_add_task_type_to_push_events.sql rename to internal/infra/persistence/migrator/goose/sqlite/202606150001_add_task_type_to_push_events.sql diff --git a/internal/db/migrator/goose/sqlite/202606160001_remove_push_config.sql b/internal/infra/persistence/migrator/goose/sqlite/202606160001_remove_push_config.sql similarity index 100% rename from internal/db/migrator/goose/sqlite/202606160001_remove_push_config.sql rename to internal/infra/persistence/migrator/goose/sqlite/202606160001_remove_push_config.sql diff --git a/internal/db/migrator/goose/sqlite/202606170001_add_upload_composite_indexes.sql b/internal/infra/persistence/migrator/goose/sqlite/202606170001_add_upload_composite_indexes.sql similarity index 100% rename from internal/db/migrator/goose/sqlite/202606170001_add_upload_composite_indexes.sql rename to internal/infra/persistence/migrator/goose/sqlite/202606170001_add_upload_composite_indexes.sql diff --git a/internal/db/migrator/goose/sqlite/202606170002_create_upload_stats_table.sql b/internal/infra/persistence/migrator/goose/sqlite/202606170002_create_upload_stats_table.sql similarity index 100% rename from internal/db/migrator/goose/sqlite/202606170002_create_upload_stats_table.sql rename to internal/infra/persistence/migrator/goose/sqlite/202606170002_create_upload_stats_table.sql diff --git a/internal/db/migrator/goose/sqlite/202606170003_backfill_upload_stats.sql b/internal/infra/persistence/migrator/goose/sqlite/202606170003_backfill_upload_stats.sql similarity index 100% rename from internal/db/migrator/goose/sqlite/202606170003_backfill_upload_stats.sql rename to internal/infra/persistence/migrator/goose/sqlite/202606170003_backfill_upload_stats.sql diff --git a/internal/db/migrator/goose/sqlite/202606180001_drop_upload_storage_driver.sql b/internal/infra/persistence/migrator/goose/sqlite/202606180001_drop_upload_storage_driver.sql similarity index 100% rename from internal/db/migrator/goose/sqlite/202606180001_drop_upload_storage_driver.sql rename to internal/infra/persistence/migrator/goose/sqlite/202606180001_drop_upload_storage_driver.sql diff --git a/internal/db/migrator/migrator.go b/internal/infra/persistence/migrator/migrator.go similarity index 95% rename from internal/db/migrator/migrator.go rename to internal/infra/persistence/migrator/migrator.go index db55b268..d8b8230e 100644 --- a/internal/db/migrator/migrator.go +++ b/internal/infra/persistence/migrator/migrator.go @@ -10,8 +10,8 @@ import ( "embed" "log" - "github.com/Rain-kl/Wavelet/internal/config" - "github.com/Rain-kl/Wavelet/internal/db" + "github.com/Rain-kl/Wavelet/internal/infra/config" + "github.com/Rain-kl/Wavelet/internal/infra/persistence" "github.com/Rain-kl/Wavelet/internal/repository" "github.com/pressly/goose/v3" ) diff --git a/internal/db/migrator/migrator_test.go b/internal/infra/persistence/migrator/migrator_test.go similarity index 97% rename from internal/db/migrator/migrator_test.go rename to internal/infra/persistence/migrator/migrator_test.go index 56a1241f..45214e01 100644 --- a/internal/db/migrator/migrator_test.go +++ b/internal/infra/persistence/migrator/migrator_test.go @@ -7,8 +7,8 @@ import ( "context" "testing" - "github.com/Rain-kl/Wavelet/internal/config" - "github.com/Rain-kl/Wavelet/internal/db" + "github.com/Rain-kl/Wavelet/internal/infra/config" + "github.com/Rain-kl/Wavelet/internal/infra/persistence" "github.com/Rain-kl/Wavelet/internal/model" "github.com/Rain-kl/Wavelet/internal/repository" "github.com/alicebob/miniredis/v2" diff --git a/internal/db/postgres.go b/internal/infra/persistence/postgres.go similarity index 99% rename from internal/db/postgres.go rename to internal/infra/persistence/postgres.go index 7e01fba8..eae9189d 100644 --- a/internal/db/postgres.go +++ b/internal/infra/persistence/postgres.go @@ -12,7 +12,7 @@ import ( "strconv" "time" - "github.com/Rain-kl/Wavelet/internal/config" + "github.com/Rain-kl/Wavelet/internal/infra/config" "github.com/glebarez/sqlite" "go.opentelemetry.io/otel/attribute" "gorm.io/driver/postgres" diff --git a/internal/db/postgres_logger.go b/internal/infra/persistence/postgres_logger.go similarity index 100% rename from internal/db/postgres_logger.go rename to internal/infra/persistence/postgres_logger.go diff --git a/internal/db/postgres_logger_test.go b/internal/infra/persistence/postgres_logger_test.go similarity index 100% rename from internal/db/postgres_logger_test.go rename to internal/infra/persistence/postgres_logger_test.go diff --git a/internal/db/redis.go b/internal/infra/persistence/redis.go similarity index 99% rename from internal/db/redis.go rename to internal/infra/persistence/redis.go index 25327675..541ae165 100644 --- a/internal/db/redis.go +++ b/internal/infra/persistence/redis.go @@ -12,7 +12,7 @@ import ( "strings" "time" - "github.com/Rain-kl/Wavelet/internal/config" + "github.com/Rain-kl/Wavelet/internal/infra/config" "github.com/redis/go-redis/extra/redisotel/v9" "github.com/redis/go-redis/v9" "github.com/redis/go-redis/v9/maintnotifications" diff --git a/internal/db/redis_test.go b/internal/infra/persistence/redis_test.go similarity index 100% rename from internal/db/redis_test.go rename to internal/infra/persistence/redis_test.go diff --git a/internal/task/constants.go b/internal/infra/task/constants.go similarity index 100% rename from internal/task/constants.go rename to internal/infra/task/constants.go diff --git a/internal/task/errs.go b/internal/infra/task/errs.go similarity index 100% rename from internal/task/errs.go rename to internal/infra/task/errs.go diff --git a/internal/task/executor.go b/internal/infra/task/executor.go similarity index 99% rename from internal/task/executor.go rename to internal/infra/task/executor.go index e41ae65e..c83a7b32 100644 --- a/internal/task/executor.go +++ b/internal/infra/task/executor.go @@ -11,7 +11,7 @@ import ( "fmt" "time" - "github.com/Rain-kl/Wavelet/internal/db/idgen" + "github.com/Rain-kl/Wavelet/internal/infra/persistence/idgen" "github.com/Rain-kl/Wavelet/internal/model" "github.com/Rain-kl/Wavelet/pkg/logger" otel_trace "github.com/Rain-kl/Wavelet/pkg/trace" diff --git a/internal/task/executor_test.go b/internal/infra/task/executor_test.go similarity index 100% rename from internal/task/executor_test.go rename to internal/infra/task/executor_test.go diff --git a/internal/task/handler.go b/internal/infra/task/handler.go similarity index 100% rename from internal/task/handler.go rename to internal/infra/task/handler.go diff --git a/internal/task/handlers/register.go b/internal/infra/task/handlers/register.go similarity index 96% rename from internal/task/handlers/register.go rename to internal/infra/task/handlers/register.go index f032ed7f..907ad17c 100644 --- a/internal/task/handlers/register.go +++ b/internal/infra/task/handlers/register.go @@ -9,7 +9,7 @@ import ( "github.com/Rain-kl/Wavelet/internal/apps/admin/push" "github.com/Rain-kl/Wavelet/internal/apps/upload" "github.com/Rain-kl/Wavelet/internal/apps/user" - "github.com/Rain-kl/Wavelet/internal/task" + "github.com/Rain-kl/Wavelet/internal/infra/task" ) // Register registers all built-in task handlers and their metadata. diff --git a/internal/task/meta.go b/internal/infra/task/meta.go similarity index 100% rename from internal/task/meta.go rename to internal/infra/task/meta.go diff --git a/internal/task/meta_test.go b/internal/infra/task/meta_test.go similarity index 84% rename from internal/task/meta_test.go rename to internal/infra/task/meta_test.go index e91c1b6b..40f5f14c 100644 --- a/internal/task/meta_test.go +++ b/internal/infra/task/meta_test.go @@ -6,8 +6,8 @@ package task_test import ( "testing" - "github.com/Rain-kl/Wavelet/internal/task" - taskhandlers "github.com/Rain-kl/Wavelet/internal/task/handlers" + "github.com/Rain-kl/Wavelet/internal/infra/task" + taskhandlers "github.com/Rain-kl/Wavelet/internal/infra/task/handlers" ) func TestDuplicateTaskMeta(t *testing.T) { diff --git a/internal/task/scheduler/errs.go b/internal/infra/task/scheduler/errs.go similarity index 100% rename from internal/task/scheduler/errs.go rename to internal/infra/task/scheduler/errs.go diff --git a/internal/task/scheduler/scheduler.go b/internal/infra/task/scheduler/scheduler.go similarity index 96% rename from internal/task/scheduler/scheduler.go rename to internal/infra/task/scheduler/scheduler.go index 478a0511..f45fcb64 100644 --- a/internal/task/scheduler/scheduler.go +++ b/internal/infra/task/scheduler/scheduler.go @@ -11,9 +11,9 @@ import ( "syscall" "time" - "github.com/Rain-kl/Wavelet/internal/bootstrap" + "github.com/Rain-kl/Wavelet/internal/infra/task" "github.com/Rain-kl/Wavelet/internal/model" - "github.com/Rain-kl/Wavelet/internal/task" + "github.com/Rain-kl/Wavelet/internal/platform/bootstrap" "github.com/Rain-kl/Wavelet/pkg/logger" "github.com/hibiken/asynq" diff --git a/internal/task/scheduler/scheduler_test.go b/internal/infra/task/scheduler/scheduler_test.go similarity index 100% rename from internal/task/scheduler/scheduler_test.go rename to internal/infra/task/scheduler/scheduler_test.go diff --git a/internal/task/utils.go b/internal/infra/task/utils.go similarity index 98% rename from internal/task/utils.go rename to internal/infra/task/utils.go index a3f0d4d3..d5afa098 100644 --- a/internal/task/utils.go +++ b/internal/infra/task/utils.go @@ -5,7 +5,7 @@ package task import ( - "github.com/Rain-kl/Wavelet/internal/config" + "github.com/Rain-kl/Wavelet/internal/infra/config" "github.com/hibiken/asynq" "github.com/redis/go-redis/v9" "github.com/redis/go-redis/v9/maintnotifications" diff --git a/internal/task/utils_test.go b/internal/infra/task/utils_test.go similarity index 97% rename from internal/task/utils_test.go rename to internal/infra/task/utils_test.go index f4356c5c..aae01e32 100644 --- a/internal/task/utils_test.go +++ b/internal/infra/task/utils_test.go @@ -3,7 +3,7 @@ package task import ( "testing" - "github.com/Rain-kl/Wavelet/internal/config" + "github.com/Rain-kl/Wavelet/internal/infra/config" "github.com/redis/go-redis/v9" "github.com/redis/go-redis/v9/maintnotifications" ) diff --git a/internal/task/worker/middlewares.go b/internal/infra/task/worker/middlewares.go similarity index 100% rename from internal/task/worker/middlewares.go rename to internal/infra/task/worker/middlewares.go diff --git a/internal/task/worker/worker.go b/internal/infra/task/worker/worker.go similarity index 90% rename from internal/task/worker/worker.go rename to internal/infra/task/worker/worker.go index b66d4f65..c53858db 100644 --- a/internal/task/worker/worker.go +++ b/internal/infra/task/worker/worker.go @@ -7,9 +7,9 @@ package worker import ( "time" - "github.com/Rain-kl/Wavelet/internal/bootstrap" - "github.com/Rain-kl/Wavelet/internal/config" - "github.com/Rain-kl/Wavelet/internal/task" + "github.com/Rain-kl/Wavelet/internal/infra/config" + "github.com/Rain-kl/Wavelet/internal/infra/task" + "github.com/Rain-kl/Wavelet/internal/platform/bootstrap" "github.com/hibiken/asynq" ) diff --git a/internal/model/auth_source.go b/internal/model/auth_source.go index d1d65d74..0abf6fff 100644 --- a/internal/model/auth_source.go +++ b/internal/model/auth_source.go @@ -10,7 +10,7 @@ import ( "strings" "time" - "github.com/Rain-kl/Wavelet/internal/db" + "github.com/Rain-kl/Wavelet/internal/infra/persistence" "gorm.io/gorm" ) diff --git a/internal/model/schedule.go b/internal/model/schedule.go index eb7f6f65..0509e929 100644 --- a/internal/model/schedule.go +++ b/internal/model/schedule.go @@ -7,7 +7,7 @@ import ( "context" "time" - "github.com/Rain-kl/Wavelet/internal/db" + "github.com/Rain-kl/Wavelet/internal/infra/persistence" ) // Schedule 定时任务配置表 diff --git a/internal/model/task_execution.go b/internal/model/task_execution.go index 4c0aac57..bde96717 100644 --- a/internal/model/task_execution.go +++ b/internal/model/task_execution.go @@ -11,8 +11,8 @@ import ( "strings" "time" - "github.com/Rain-kl/Wavelet/internal/db" - "github.com/Rain-kl/Wavelet/internal/db/idgen" + "github.com/Rain-kl/Wavelet/internal/infra/persistence" + "github.com/Rain-kl/Wavelet/internal/infra/persistence/idgen" "github.com/redis/go-redis/v9" ) diff --git a/internal/model/task_execution_test.go b/internal/model/task_execution_test.go index dc769462..962c1200 100644 --- a/internal/model/task_execution_test.go +++ b/internal/model/task_execution_test.go @@ -10,7 +10,7 @@ import ( "testing" "time" - "github.com/Rain-kl/Wavelet/internal/db" + "github.com/Rain-kl/Wavelet/internal/infra/persistence" "github.com/alicebob/miniredis/v2" "github.com/glebarez/sqlite" "github.com/redis/go-redis/v9" diff --git a/internal/model/users.go b/internal/model/users.go index 179c1ea5..a8495910 100644 --- a/internal/model/users.go +++ b/internal/model/users.go @@ -11,8 +11,8 @@ import ( "strings" "time" - "github.com/Rain-kl/Wavelet/internal/common" - "github.com/Rain-kl/Wavelet/internal/db/idgen" + "github.com/Rain-kl/Wavelet/internal/infra/persistence/idgen" + "github.com/Rain-kl/Wavelet/internal/shared" "github.com/Rain-kl/Wavelet/pkg/util" "gorm.io/gorm" ) @@ -125,7 +125,7 @@ func (u *User) UpdateFromOAuthInfo(oauthInfo *OAuthUserInfo) { // CheckActive 检查用户账户是否激活,未激活则返回错误 func (u *User) CheckActive() error { if !u.IsActive { - return errors.New(common.BannedAccount) + return errors.New(shared.BannedAccount) } return nil } diff --git a/internal/bootstrap/bootstrap.go b/internal/platform/bootstrap/bootstrap.go similarity index 97% rename from internal/bootstrap/bootstrap.go rename to internal/platform/bootstrap/bootstrap.go index b9f84589..537b64c9 100644 --- a/internal/bootstrap/bootstrap.go +++ b/internal/platform/bootstrap/bootstrap.go @@ -12,9 +12,9 @@ import ( admin_push "github.com/Rain-kl/Wavelet/internal/apps/admin/push" "github.com/Rain-kl/Wavelet/internal/apps/admin/push/custom_events" "github.com/Rain-kl/Wavelet/internal/apps/risk_control" - "github.com/Rain-kl/Wavelet/internal/lifecycle" + taskhandlers "github.com/Rain-kl/Wavelet/internal/infra/task/handlers" + "github.com/Rain-kl/Wavelet/internal/platform/lifecycle" "github.com/Rain-kl/Wavelet/internal/repository" - taskhandlers "github.com/Rain-kl/Wavelet/internal/task/handlers" "github.com/Rain-kl/Wavelet/pkg/cache/ram" "github.com/Rain-kl/Wavelet/pkg/logger" ) diff --git a/internal/bootstrap/bootstrap_test.go b/internal/platform/bootstrap/bootstrap_test.go similarity index 100% rename from internal/bootstrap/bootstrap_test.go rename to internal/platform/bootstrap/bootstrap_test.go diff --git a/internal/lifecycle/lifecycle.go b/internal/platform/lifecycle/lifecycle.go similarity index 100% rename from internal/lifecycle/lifecycle.go rename to internal/platform/lifecycle/lifecycle.go diff --git a/internal/repository/analytics/access_log.go b/internal/repository/analytics/access_log.go index f79e2e8e..3a5c30f5 100644 --- a/internal/repository/analytics/access_log.go +++ b/internal/repository/analytics/access_log.go @@ -8,7 +8,7 @@ import ( "context" "fmt" - "github.com/Rain-kl/Wavelet/internal/db" + "github.com/Rain-kl/Wavelet/internal/infra/persistence" analyticsmodel "github.com/Rain-kl/Wavelet/internal/model/analytics" "gorm.io/gorm" ) diff --git a/internal/repository/analytics/access_log_stats.go b/internal/repository/analytics/access_log_stats.go index 02136f09..6f9321ac 100644 --- a/internal/repository/analytics/access_log_stats.go +++ b/internal/repository/analytics/access_log_stats.go @@ -9,7 +9,7 @@ import ( "sort" "time" - "github.com/Rain-kl/Wavelet/internal/db" + "github.com/Rain-kl/Wavelet/internal/infra/persistence" analyticsmodel "github.com/Rain-kl/Wavelet/internal/model/analytics" ) diff --git a/internal/repository/analytics/access_log_test.go b/internal/repository/analytics/access_log_test.go index b94a82d7..0f12cda8 100644 --- a/internal/repository/analytics/access_log_test.go +++ b/internal/repository/analytics/access_log_test.go @@ -10,7 +10,7 @@ import ( "github.com/ClickHouse/clickhouse-go/v2/lib/column" "github.com/ClickHouse/clickhouse-go/v2/lib/driver" - "github.com/Rain-kl/Wavelet/internal/db" + "github.com/Rain-kl/Wavelet/internal/infra/persistence" analyticsmodel "github.com/Rain-kl/Wavelet/internal/model/analytics" "github.com/glebarez/sqlite" "github.com/stretchr/testify/assert" diff --git a/internal/repository/analytics/access_log_writer.go b/internal/repository/analytics/access_log_writer.go index bbbe2d0e..67bdd293 100644 --- a/internal/repository/analytics/access_log_writer.go +++ b/internal/repository/analytics/access_log_writer.go @@ -7,7 +7,7 @@ import ( "context" "fmt" - "github.com/Rain-kl/Wavelet/internal/db" + "github.com/Rain-kl/Wavelet/internal/infra/persistence" analyticsmodel "github.com/Rain-kl/Wavelet/internal/model/analytics" ) diff --git a/internal/repository/auth_source_cache.go b/internal/repository/auth_source_cache.go index 6650b127..11a6ab77 100644 --- a/internal/repository/auth_source_cache.go +++ b/internal/repository/auth_source_cache.go @@ -10,7 +10,7 @@ import ( "sync" "time" - "github.com/Rain-kl/Wavelet/internal/db" + "github.com/Rain-kl/Wavelet/internal/infra/persistence" "github.com/Rain-kl/Wavelet/internal/model" "github.com/Rain-kl/Wavelet/pkg/cache/ram" ) diff --git a/internal/repository/auth_source_cache_test.go b/internal/repository/auth_source_cache_test.go index a39fe060..7dd1c93d 100644 --- a/internal/repository/auth_source_cache_test.go +++ b/internal/repository/auth_source_cache_test.go @@ -14,7 +14,7 @@ import ( "github.com/redis/go-redis/v9/maintnotifications" "gorm.io/gorm" - "github.com/Rain-kl/Wavelet/internal/db" + "github.com/Rain-kl/Wavelet/internal/infra/persistence" "github.com/Rain-kl/Wavelet/internal/model" ) diff --git a/internal/repository/push_channel.go b/internal/repository/push_channel.go index 6ce210f3..23e3cfb0 100644 --- a/internal/repository/push_channel.go +++ b/internal/repository/push_channel.go @@ -7,7 +7,7 @@ import ( "context" "time" - "github.com/Rain-kl/Wavelet/internal/db" + "github.com/Rain-kl/Wavelet/internal/infra/persistence" "github.com/Rain-kl/Wavelet/internal/model" ) diff --git a/internal/repository/push_event.go b/internal/repository/push_event.go index dbc02aee..0ef22c1a 100644 --- a/internal/repository/push_event.go +++ b/internal/repository/push_event.go @@ -7,7 +7,7 @@ import ( "context" "time" - "github.com/Rain-kl/Wavelet/internal/db" + "github.com/Rain-kl/Wavelet/internal/infra/persistence" "github.com/Rain-kl/Wavelet/internal/model" ) diff --git a/internal/repository/push_history.go b/internal/repository/push_history.go index 463087c3..221eb4ee 100644 --- a/internal/repository/push_history.go +++ b/internal/repository/push_history.go @@ -6,7 +6,7 @@ package repository import ( "context" - "github.com/Rain-kl/Wavelet/internal/db" + "github.com/Rain-kl/Wavelet/internal/infra/persistence" "github.com/Rain-kl/Wavelet/internal/model" "gorm.io/gorm" ) diff --git a/internal/repository/system_config.go b/internal/repository/system_config.go index 4291aaa9..4269ce11 100644 --- a/internal/repository/system_config.go +++ b/internal/repository/system_config.go @@ -13,7 +13,7 @@ import ( "github.com/shopspring/decimal" - "github.com/Rain-kl/Wavelet/internal/db" + "github.com/Rain-kl/Wavelet/internal/infra/persistence" "github.com/Rain-kl/Wavelet/internal/model" "github.com/Rain-kl/Wavelet/pkg/cache/ram" ) diff --git a/internal/repository/system_config_admin.go b/internal/repository/system_config_admin.go index 9a5c7841..247efa28 100644 --- a/internal/repository/system_config_admin.go +++ b/internal/repository/system_config_admin.go @@ -7,7 +7,7 @@ import ( "context" "errors" - "github.com/Rain-kl/Wavelet/internal/db" + "github.com/Rain-kl/Wavelet/internal/infra/persistence" "github.com/Rain-kl/Wavelet/internal/model" "gorm.io/gorm" ) diff --git a/internal/repository/system_config_cache.go b/internal/repository/system_config_cache.go index 3c99b100..4ee82daf 100644 --- a/internal/repository/system_config_cache.go +++ b/internal/repository/system_config_cache.go @@ -12,7 +12,7 @@ import ( "gorm.io/gorm" - "github.com/Rain-kl/Wavelet/internal/db" + "github.com/Rain-kl/Wavelet/internal/infra/persistence" "github.com/Rain-kl/Wavelet/pkg/cache/ram" ) diff --git a/internal/repository/system_config_test.go b/internal/repository/system_config_test.go index 9e374951..921f9778 100644 --- a/internal/repository/system_config_test.go +++ b/internal/repository/system_config_test.go @@ -14,7 +14,7 @@ import ( "github.com/redis/go-redis/v9/maintnotifications" "gorm.io/gorm" - "github.com/Rain-kl/Wavelet/internal/db" + "github.com/Rain-kl/Wavelet/internal/infra/persistence" "github.com/Rain-kl/Wavelet/internal/model" ) diff --git a/internal/repository/template.go b/internal/repository/template.go index f2d4a695..1cba12e5 100644 --- a/internal/repository/template.go +++ b/internal/repository/template.go @@ -7,7 +7,7 @@ import ( "context" "errors" - "github.com/Rain-kl/Wavelet/internal/db" + "github.com/Rain-kl/Wavelet/internal/infra/persistence" "github.com/Rain-kl/Wavelet/internal/model" "gorm.io/gorm" ) diff --git a/internal/repository/upload.go b/internal/repository/upload.go index 34c8a96f..213dba32 100644 --- a/internal/repository/upload.go +++ b/internal/repository/upload.go @@ -7,7 +7,7 @@ import ( "context" "strings" - "github.com/Rain-kl/Wavelet/internal/db" + "github.com/Rain-kl/Wavelet/internal/infra/persistence" "github.com/Rain-kl/Wavelet/internal/model" "gorm.io/gorm" ) diff --git a/internal/repository/upload_stat.go b/internal/repository/upload_stat.go index 58f96fdc..cf87c6bc 100644 --- a/internal/repository/upload_stat.go +++ b/internal/repository/upload_stat.go @@ -6,7 +6,7 @@ package repository import ( "context" - "github.com/Rain-kl/Wavelet/internal/db" + "github.com/Rain-kl/Wavelet/internal/infra/persistence" "github.com/Rain-kl/Wavelet/internal/model" ) diff --git a/internal/repository/user.go b/internal/repository/user.go index b93b1d43..c1d7f722 100644 --- a/internal/repository/user.go +++ b/internal/repository/user.go @@ -6,7 +6,7 @@ package repository import ( "context" - "github.com/Rain-kl/Wavelet/internal/db" + "github.com/Rain-kl/Wavelet/internal/infra/persistence" "github.com/Rain-kl/Wavelet/internal/model" "gorm.io/gorm" ) diff --git a/internal/router/middlewares.go b/internal/router/middlewares.go index 2ef6d7f9..b6c42f21 100644 --- a/internal/router/middlewares.go +++ b/internal/router/middlewares.go @@ -12,10 +12,10 @@ import ( "strings" "time" - "github.com/Rain-kl/Wavelet/internal/common/response" - "github.com/Rain-kl/Wavelet/internal/config" + "github.com/Rain-kl/Wavelet/internal/infra/config" "github.com/Rain-kl/Wavelet/internal/model" "github.com/Rain-kl/Wavelet/internal/repository" + "github.com/Rain-kl/Wavelet/internal/shared/response" "github.com/Rain-kl/Wavelet/pkg/logger" otel_trace "github.com/Rain-kl/Wavelet/pkg/trace" "github.com/gin-gonic/gin" diff --git a/internal/router/root/default.go b/internal/router/root/default.go index 9622fb1a..d19baddc 100644 --- a/internal/router/root/default.go +++ b/internal/router/root/default.go @@ -8,7 +8,7 @@ import ( publicconfig "github.com/Rain-kl/Wavelet/internal/apps/config" "github.com/Rain-kl/Wavelet/internal/apps/health" "github.com/Rain-kl/Wavelet/internal/apps/upload" - "github.com/Rain-kl/Wavelet/internal/config" + "github.com/Rain-kl/Wavelet/internal/infra/config" "github.com/gin-gonic/gin" swaggerFiles "github.com/swaggo/files" ginSwagger "github.com/swaggo/gin-swagger" diff --git a/internal/router/router.go b/internal/router/router.go index 1d8a09c4..9fd5516b 100644 --- a/internal/router/router.go +++ b/internal/router/router.go @@ -17,12 +17,12 @@ import ( "time" "github.com/Rain-kl/Wavelet/internal/apps/risk_control" - "github.com/Rain-kl/Wavelet/internal/bootstrap" + "github.com/Rain-kl/Wavelet/internal/platform/bootstrap" router_root "github.com/Rain-kl/Wavelet/internal/router/root" v1 "github.com/Rain-kl/Wavelet/internal/router/v1" "github.com/Rain-kl/Wavelet/internal/apps/oauth" - "github.com/Rain-kl/Wavelet/internal/config" + "github.com/Rain-kl/Wavelet/internal/infra/config" otel_trace "github.com/Rain-kl/Wavelet/pkg/trace" "github.com/gin-contrib/sessions" "github.com/gin-contrib/sessions/redis" diff --git a/internal/shared/constants.go b/internal/shared/constants.go new file mode 100644 index 00000000..d2793f58 --- /dev/null +++ b/internal/shared/constants.go @@ -0,0 +1,6 @@ +// Copyright 2025 linux.do +// Copyright 2026 Arctel.net +// SPDX-License-Identifier: Apache-2.0 + +// Package shared 提供跨模块共享的常量、错误定义和通用类型。 +package shared diff --git a/internal/common/errs.go b/internal/shared/errs.go similarity index 93% rename from internal/common/errs.go rename to internal/shared/errs.go index 20d9a8b1..c5c61b8c 100644 --- a/internal/common/errs.go +++ b/internal/shared/errs.go @@ -2,7 +2,7 @@ // Copyright 2026 Arctel.net // SPDX-License-Identifier: Apache-2.0 -package common +package shared // 通用业务错误消息常量 const ( diff --git a/internal/common/response/abort.go b/internal/shared/response/abort.go similarity index 100% rename from internal/common/response/abort.go rename to internal/shared/response/abort.go diff --git a/internal/common/response/middleware.go b/internal/shared/response/middleware.go similarity index 100% rename from internal/common/response/middleware.go rename to internal/shared/response/middleware.go diff --git a/internal/common/response/middleware_test.go b/internal/shared/response/middleware_test.go similarity index 100% rename from internal/common/response/middleware_test.go rename to internal/shared/response/middleware_test.go diff --git a/internal/common/response/response.go b/internal/shared/response/response.go similarity index 100% rename from internal/common/response/response.go rename to internal/shared/response/response.go diff --git a/internal/testhelper/gin.go b/internal/testhelper/gin.go index 2caad1b9..edb9c9f9 100644 --- a/internal/testhelper/gin.go +++ b/internal/testhelper/gin.go @@ -4,7 +4,7 @@ package testhelper import ( - "github.com/Rain-kl/Wavelet/internal/common/response" + "github.com/Rain-kl/Wavelet/internal/shared/response" "github.com/gin-gonic/gin" ) diff --git a/internal/testhelper/test_helper.go b/internal/testhelper/test_helper.go index 3360377f..f5b29ac9 100644 --- a/internal/testhelper/test_helper.go +++ b/internal/testhelper/test_helper.go @@ -9,7 +9,7 @@ import ( "context" "testing" - "github.com/Rain-kl/Wavelet/internal/db" + "github.com/Rain-kl/Wavelet/internal/infra/persistence" "github.com/Rain-kl/Wavelet/internal/model" "github.com/Rain-kl/Wavelet/internal/repository" "github.com/alicebob/miniredis/v2"