diff --git a/go.mod b/go.mod index 08116de..a104359 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.22.0 toolchain go1.22.2 require ( - gitea.pena/PenaSide/common v0.0.0-20241120141501-1695a0981562 + gitea.pena/PenaSide/common v0.0.0-20241128160655-fe730a08b5f1 gitea.pena/PenaSide/customer v0.0.0-20241118214409-34a88a3a7001 //dev gitea.pena/PenaSide/trashlog v0.0.0-20241119225515-2fd267647ca4 //dev github.com/caarlos0/env/v8 v8.0.0 diff --git a/go.sum b/go.sum index e99f169..549e36a 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,5 @@ -gitea.pena/PenaSide/common v0.0.0-20241120141501-1695a0981562 h1:LobhWlICMcbCCI+SouOzeRk2K5MsXSVHtv3QOcHRZnY= -gitea.pena/PenaSide/common v0.0.0-20241120141501-1695a0981562/go.mod h1:l71j3W1yROhOSfjWZ6wcMuzjBR37gu2ZTcXsorEJoiw= +gitea.pena/PenaSide/common v0.0.0-20241128160655-fe730a08b5f1 h1:w1AAxrlZGmxUI9NAa/0TYsc6sqWWF9yAzQaLL/KxwrM= +gitea.pena/PenaSide/common v0.0.0-20241128160655-fe730a08b5f1/go.mod h1:l71j3W1yROhOSfjWZ6wcMuzjBR37gu2ZTcXsorEJoiw= gitea.pena/PenaSide/customer v0.0.0-20241118214409-34a88a3a7001 h1:bnwlhVx7LzwAYgx25G8/qezqkXvatL1de9nQZvpO0IE= gitea.pena/PenaSide/customer v0.0.0-20241118214409-34a88a3a7001/go.mod h1:6lKbvPc2E2TcNSxG8WlC/XBuhqW6smKQtpYPLedheqU= gitea.pena/PenaSide/trashlog v0.0.0-20241119225515-2fd267647ca4 h1:y9B4CSPIgiUoaXKyXLZxs1A9hxzDj26F9MH2R6uTkHQ= diff --git a/internal/app/app_verification.go b/internal/app/app_verification.go index ae5a105..9f5d5dd 100644 --- a/internal/app/app_verification.go +++ b/internal/app/app_verification.go @@ -2,21 +2,21 @@ package app import ( "context" + mongo "gitea.pena/PenaSide/common/mongo" + "gitea.pena/PenaSide/customer/pkg/customer_clients" + "gitea.pena/PenaSide/trashlog/app" + "gitea.pena/PenaSide/trashlog/wrappers/zaptrashlog" + "gitea.pena/PenaSide/verification/internal/client" + "gitea.pena/PenaSide/verification/internal/config" + "gitea.pena/PenaSide/verification/internal/initialize" + "gitea.pena/PenaSide/verification/internal/models" + "gitea.pena/PenaSide/verification/internal/server" tgbotapi "github.com/go-telegram-bot-api/telegram-bot-api/v5" "github.com/minio/minio-go/v7" "github.com/minio/minio-go/v7/pkg/credentials" "github.com/themakers/hlog" "go.uber.org/zap" "go.uber.org/zap/zapcore" - mongo "gitea.pena/PenaSide/common/mongo" - "gitea.pena/PenaSide/verification/internal/client" - "gitea.pena/PenaSide/verification/internal/config" - "gitea.pena/PenaSide/verification/internal/initialize" - "gitea.pena/PenaSide/verification/internal/models" - "gitea.pena/PenaSide/verification/internal/server" - "gitea.pena/PenaSide/trashlog/app" - "gitea.pena/PenaSide/trashlog/wrappers/zaptrashlog" - "gitea.pena/PenaSide/customer/pkg/customer_clients" "time" ) @@ -54,15 +54,8 @@ func Run(cfg *config.Config, build Build) { loggerHlog.Emit(app.InfoSvcStarted{}) mongoDB, err := mongo.Connect(ctx, &mongo.ConnectDeps{ - Configuration: &mongo.Configuration{ - Host: cfg.MongoHost, - Port: cfg.MongoPort, - User: cfg.MongoUser, - Password: cfg.MongoPassword, - Auth: cfg.MongoAuth, - DatabaseName: cfg.DatabaseName, - }, - Timeout: 5 * time.Second, + Configuration: &cfg.Database, + Timeout: 5 * time.Second, }) if err != nil { diff --git a/internal/config/config.go b/internal/config/config.go index c39555f..0075085 100644 --- a/internal/config/config.go +++ b/internal/config/config.go @@ -1,6 +1,7 @@ package config import ( + "gitea.pena/PenaSide/common/mongo" "github.com/caarlos0/env/v8" "github.com/joho/godotenv" ) @@ -10,12 +11,6 @@ type Config struct { TelegramChannelID int64 `env:"TELEGRAM_CHANNEL_ID,required"` HttpAddressUser string `env:"HTTP_ADDRESS_USER,required"` HttpAddressAdmin string `env:"HTTP_ADDRESS_ADMIN,required"` - MongoHost string `env:"MONGO_HOST,required"` - MongoPort string `env:"MONGO_PORT,required"` - MongoUser string `env:"MONGO_USER,required"` - MongoPassword string `env:"MONGO_PASSWORD,required"` - MongoAuth string `env:"MONGO_AUTH,required"` - DatabaseName string `env:"MONGO_DATABASE_NAME,required"` S3Endpoint string `env:"S3_ENDPOINT,required"` S3AccessKeyID string `env:"S3_ACCESS_KEY_ID,required"` S3SecretKey string `env:"S3_SECRET_KEY,required"` @@ -26,6 +21,7 @@ type Config struct { CustomerRPCHost string `env:"CUSTOMER_RPC_HOST,required"` TrashLogHost string `env:"TRASH_LOG_HOST,required"` ModuleLogger string `env:"MODULE_LOGGER,required"` + Database mongo.Configuration } func NewConfig(file ...string) (*Config, error) {