From 207c7c0e771b641d3bacd710c0640f6d9c9ce0f9 Mon Sep 17 00:00:00 2001 From: alimy Date: Sun, 19 Jan 2025 14:28:21 +0800 Subject: [PATCH] add internal/infra package as infrastruct components package --- internal/dao/cache/events.go | 2 +- internal/{ => infra}/events/events.go | 2 +- internal/{ => infra}/events/events_tryst.go | 0 internal/{ => infra}/events/jobs.go | 0 internal/infra/infra.go | 3 +++ internal/{ => infra}/metrics/metrics.go | 0 internal/{ => infra}/metrics/metrics_tryst.go | 0 internal/{ => infra}/metrics/prometheus/metrics.go | 0 internal/{ => infra}/metrics/prometheus/prometheus.go | 2 +- internal/{ => infra}/metrics/statistics/cache.go | 0 internal/{ => infra}/migration/migration.go | 0 internal/{ => infra}/migration/migration_embed.go | 0 internal/internal.go | 6 +++--- internal/model/enum/enum.go | 3 +++ internal/servants/base/base.go | 2 +- internal/servants/base/events.go | 2 +- internal/servants/chain/events.go | 2 +- internal/servants/chain/metrics.go | 2 +- internal/servants/web/events.go | 2 +- internal/servants/web/jobs.go | 2 +- internal/service/metrics.go | 4 ++-- 21 files changed, 20 insertions(+), 14 deletions(-) rename internal/{ => infra}/events/events.go (97%) rename internal/{ => infra}/events/events_tryst.go (100%) rename internal/{ => infra}/events/jobs.go (100%) create mode 100644 internal/infra/infra.go rename internal/{ => infra}/metrics/metrics.go (100%) rename internal/{ => infra}/metrics/metrics_tryst.go (100%) rename internal/{ => infra}/metrics/prometheus/metrics.go (100%) rename internal/{ => infra}/metrics/prometheus/prometheus.go (95%) rename internal/{ => infra}/metrics/statistics/cache.go (100%) rename internal/{ => infra}/migration/migration.go (100%) rename internal/{ => infra}/migration/migration_embed.go (100%) create mode 100644 internal/model/enum/enum.go diff --git a/internal/dao/cache/events.go b/internal/dao/cache/events.go index e8c0e62b..92353b3f 100644 --- a/internal/dao/cache/events.go +++ b/internal/dao/cache/events.go @@ -14,7 +14,7 @@ import ( "github.com/rocboss/paopao-ce/internal/conf" "github.com/rocboss/paopao-ce/internal/core" "github.com/rocboss/paopao-ce/internal/core/ms" - "github.com/rocboss/paopao-ce/internal/events" + "github.com/rocboss/paopao-ce/internal/infra/events" "github.com/sirupsen/logrus" ) diff --git a/internal/events/events.go b/internal/infra/events/events.go similarity index 97% rename from internal/events/events.go rename to internal/infra/events/events.go index e35fa77f..a3e93b60 100644 --- a/internal/events/events.go +++ b/internal/infra/events/events.go @@ -11,7 +11,7 @@ import ( "github.com/alimy/tryst/pool" "github.com/robfig/cron/v3" "github.com/rocboss/paopao-ce/internal/conf" - "github.com/rocboss/paopao-ce/internal/metrics/statistics" + "github.com/rocboss/paopao-ce/internal/infra/metrics/statistics" "github.com/sirupsen/logrus" ) diff --git a/internal/events/events_tryst.go b/internal/infra/events/events_tryst.go similarity index 100% rename from internal/events/events_tryst.go rename to internal/infra/events/events_tryst.go diff --git a/internal/events/jobs.go b/internal/infra/events/jobs.go similarity index 100% rename from internal/events/jobs.go rename to internal/infra/events/jobs.go diff --git a/internal/infra/infra.go b/internal/infra/infra.go new file mode 100644 index 00000000..01316019 --- /dev/null +++ b/internal/infra/infra.go @@ -0,0 +1,3 @@ +// Package infra infrastructure components. + +package infra diff --git a/internal/metrics/metrics.go b/internal/infra/metrics/metrics.go similarity index 100% rename from internal/metrics/metrics.go rename to internal/infra/metrics/metrics.go diff --git a/internal/metrics/metrics_tryst.go b/internal/infra/metrics/metrics_tryst.go similarity index 100% rename from internal/metrics/metrics_tryst.go rename to internal/infra/metrics/metrics_tryst.go diff --git a/internal/metrics/prometheus/metrics.go b/internal/infra/metrics/prometheus/metrics.go similarity index 100% rename from internal/metrics/prometheus/metrics.go rename to internal/infra/metrics/prometheus/metrics.go diff --git a/internal/metrics/prometheus/prometheus.go b/internal/infra/metrics/prometheus/prometheus.go similarity index 95% rename from internal/metrics/prometheus/prometheus.go rename to internal/infra/metrics/prometheus/prometheus.go index e93565cf..286ed3bb 100644 --- a/internal/metrics/prometheus/prometheus.go +++ b/internal/infra/metrics/prometheus/prometheus.go @@ -13,7 +13,7 @@ import ( "github.com/robfig/cron/v3" "github.com/rocboss/paopao-ce/internal/conf" "github.com/rocboss/paopao-ce/internal/core" - "github.com/rocboss/paopao-ce/internal/events" + "github.com/rocboss/paopao-ce/internal/infra/events" "github.com/sirupsen/logrus" ) diff --git a/internal/metrics/statistics/cache.go b/internal/infra/metrics/statistics/cache.go similarity index 100% rename from internal/metrics/statistics/cache.go rename to internal/infra/metrics/statistics/cache.go diff --git a/internal/migration/migration.go b/internal/infra/migration/migration.go similarity index 100% rename from internal/migration/migration.go rename to internal/infra/migration/migration.go diff --git a/internal/migration/migration_embed.go b/internal/infra/migration/migration_embed.go similarity index 100% rename from internal/migration/migration_embed.go rename to internal/infra/migration/migration_embed.go diff --git a/internal/internal.go b/internal/internal.go index 20780a10..7789237a 100644 --- a/internal/internal.go +++ b/internal/internal.go @@ -5,9 +5,9 @@ package internal import ( - "github.com/rocboss/paopao-ce/internal/events" - "github.com/rocboss/paopao-ce/internal/metrics" - "github.com/rocboss/paopao-ce/internal/migration" + "github.com/rocboss/paopao-ce/internal/infra/events" + "github.com/rocboss/paopao-ce/internal/infra/metrics" + "github.com/rocboss/paopao-ce/internal/infra/migration" ) func Initial() { diff --git a/internal/model/enum/enum.go b/internal/model/enum/enum.go new file mode 100644 index 00000000..95b2c4f4 --- /dev/null +++ b/internal/model/enum/enum.go @@ -0,0 +1,3 @@ +// Package enum all const enum variables define. + +package enum diff --git a/internal/servants/base/base.go b/internal/servants/base/base.go index c08de75f..3f4d9d10 100644 --- a/internal/servants/base/base.go +++ b/internal/servants/base/base.go @@ -21,7 +21,7 @@ import ( "github.com/rocboss/paopao-ce/internal/core/ms" "github.com/rocboss/paopao-ce/internal/dao" "github.com/rocboss/paopao-ce/internal/dao/cache" - "github.com/rocboss/paopao-ce/internal/events" + "github.com/rocboss/paopao-ce/internal/infra/events" "github.com/rocboss/paopao-ce/internal/model/joint" "github.com/rocboss/paopao-ce/pkg/app" "github.com/rocboss/paopao-ce/pkg/types" diff --git a/internal/servants/base/events.go b/internal/servants/base/events.go index 2c840a2b..c26127fc 100644 --- a/internal/servants/base/events.go +++ b/internal/servants/base/events.go @@ -10,7 +10,7 @@ import ( "github.com/alimy/tryst/event" "github.com/rocboss/paopao-ce/internal/core" "github.com/rocboss/paopao-ce/internal/core/ms" - "github.com/rocboss/paopao-ce/internal/events" + "github.com/rocboss/paopao-ce/internal/infra/events" "github.com/rocboss/paopao-ce/internal/model/joint" "github.com/rocboss/paopao-ce/pkg/json" ) diff --git a/internal/servants/chain/events.go b/internal/servants/chain/events.go index d1d73777..21434884 100644 --- a/internal/servants/chain/events.go +++ b/internal/servants/chain/events.go @@ -6,7 +6,7 @@ package chain import ( "github.com/alimy/tryst/event" - "github.com/rocboss/paopao-ce/internal/events" + "github.com/rocboss/paopao-ce/internal/infra/events" "github.com/rocboss/paopao-ce/internal/model/web" "github.com/sirupsen/logrus" ) diff --git a/internal/servants/chain/metrics.go b/internal/servants/chain/metrics.go index a6d550c6..2b01f0b5 100644 --- a/internal/servants/chain/metrics.go +++ b/internal/servants/chain/metrics.go @@ -7,7 +7,7 @@ package chain import ( "github.com/rocboss/paopao-ce/internal/conf" "github.com/rocboss/paopao-ce/internal/core" - "github.com/rocboss/paopao-ce/internal/metrics" + "github.com/rocboss/paopao-ce/internal/infra/metrics" ) type OnlineUserMetric struct { diff --git a/internal/servants/web/events.go b/internal/servants/web/events.go index 79c23598..0e129fdd 100644 --- a/internal/servants/web/events.go +++ b/internal/servants/web/events.go @@ -14,7 +14,7 @@ import ( "github.com/rocboss/paopao-ce/internal/core/cs" "github.com/rocboss/paopao-ce/internal/core/ms" "github.com/rocboss/paopao-ce/internal/dao/cache" - "github.com/rocboss/paopao-ce/internal/events" + "github.com/rocboss/paopao-ce/internal/infra/events" "github.com/rocboss/paopao-ce/internal/model/joint" "github.com/rocboss/paopao-ce/internal/model/web" "github.com/sirupsen/logrus" diff --git a/internal/servants/web/jobs.go b/internal/servants/web/jobs.go index eb06589c..b4eb2c9a 100644 --- a/internal/servants/web/jobs.go +++ b/internal/servants/web/jobs.go @@ -8,7 +8,7 @@ import ( "github.com/alimy/tryst/cfg" "github.com/robfig/cron/v3" "github.com/rocboss/paopao-ce/internal/conf" - "github.com/rocboss/paopao-ce/internal/events" + "github.com/rocboss/paopao-ce/internal/infra/events" "github.com/sirupsen/logrus" ) diff --git a/internal/service/metrics.go b/internal/service/metrics.go index 14ffbfed..57c7c625 100644 --- a/internal/service/metrics.go +++ b/internal/service/metrics.go @@ -13,8 +13,8 @@ import ( "github.com/rocboss/paopao-ce/internal/conf" "github.com/rocboss/paopao-ce/internal/dao" "github.com/rocboss/paopao-ce/internal/dao/cache" - "github.com/rocboss/paopao-ce/internal/metrics/prometheus" - "github.com/rocboss/paopao-ce/internal/metrics/statistics" + "github.com/rocboss/paopao-ce/internal/infra/metrics/prometheus" + "github.com/rocboss/paopao-ce/internal/infra/metrics/statistics" ) var (