mend

deployments/staging/docker-compose.yaml

@@ -7,44 +7,46 @@ services:
     labels:
       com.pena.allowed_headers: content-type,authorization,response-type
     environment:
-      - CLIENT_HTTP_URL=0.0.0.0:8065
+      CLIENT_HTTP_URL: 0.0.0.0:8065
-      - ADMIN_HTTP_URL=0.0.0.0:8066
+      ADMIN_HTTP_URL: 0.0.0.0:8066
 
-      - GRPC_URL=0.0.0.0:9065
+      GRPC_URL: 0.0.0.0:9065
-      - GRPC_DOMAIN=10.8.0.6:9060
+      GRPC_DOMAIN: 10.7.0.6:9060
 
 #      - MONGO_HOST=10.7.0.4
 #      - MONGO_PORT=27017
 #      - MONGO_USER=$MONGO_USER
 #      - MONGO_PASSWORD=$MONGO_PASSWORD
-      - MONGO_URL=mongodb://customer:WAR2Fr6SuPKhtvEp@10.7.0.6:27017/?authSource=customer
+      MONGO_URL: mongodb://customer:WAR2Fr6SuPKhtvEp@10.7.0.6:27017/?authSource=customer
-      - MONGO_DB_NAME=customer
+      MONGO_DB_NAME: customer
 #      - MONGO_AUTH=customer
-      - TELEGRAM_RS_PAY_CHANNEL_ID=-1002338593104
+      TELEGRAM_RS_PAY_CHANNEL_ID: -1002338593104
-      - TELEGRAM_NOTIFICATION_CHANNEL_ID=-1002338593104
+      TELEGRAM_NOTIFICATION_CHANNEL_ID: -1002338593104
 
-      - KAFKA_BROKERS=10.7.0.6:9092
+      KAFKA_BROKERS: 10.7.0.6:9092
-      - KAFKA_TOPIC_TARIFF=tariffs
+      KAFKA_TOPIC_TARIFF: tariffs
 
-      - AUTH_MICROSERVICE_URL=http://10.8.0.6:59300
+      AUTH_MICROSERVICE_URL: http://10.7.0.6:59300
-      - HUBADMIN_MICROSERVICE_URL=http://10.8.0.6:59303
+      HUBADMIN_MICROSERVICE_URL: http://10.7.0.6:59303
-      - CURRENCY_MICROSERVICE_URL=http://10.8.0.6:3131
+      CURRENCY_MICROSERVICE_URL: http://10.7.0.6:3131
-      - DISCOUNT_MICROSERVICE_GRPC_URL=10.8.0.6:9001
+      DISCOUNT_MICROSERVICE_GRPC_URL: 10.7.0.6:9001
-      - PAYMENT_MICROSERVICE_GRPC_URL=10.8.0.6:9085
+      PAYMENT_MICROSERVICE_GRPC_URL: 10.7.0.6:9085
-      - VERIFICATION_MICROSERVICE_URL=http://10.8.0.6:7036
+      VERIFICATION_MICROSERVICE_URL: http://10.7.0.6:7036
-      - TEMPLATEGEN_MICROSERVICE_URL=http://10.6.0.17
+      TEMPLATEGEN_MICROSERVICE_URL: http://10.7.0.6
-      - API_URL=https://api.smtp.bz/v1/smtp/send
+      API_URL: https://api.smtp.bz/v1/smtp/send
-      - CODEWORD_MICROSERVICE_GRPC_URL=10.8.0.6:59665
+      CODEWORD_MICROSERVICE_GRPC_URL: 10.7.0.6:59665
-      - MAIL_SENDER=noreply@mailing.pena.digital
+      MAIL_SENDER: noreply@mailing.pena.digital
-      - MAIL_API_KEY=P0YsjUB137upXrr1NiJefHmXVKW1hmBWlpev
+      MAIL_API_KEY: P0YsjUB137upXrr1NiJefHmXVKW1hmBWlpev
-      - MAIL_ADDRESS=sells@pena.digital
+      MAIL_ADDRESS: sells@pena.digital
-      - JWT_SECRET="-----BEGIN PUBLIC KEY-----\nMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCLW1tlHyKC9AG0hGpmkksET2DE\nr7ojSPemxFWAgFgcPJWQ7x3uNbsdJ3bIZFoA/FClaWKMCZmjnH9tv0bKZtY/CDhM\nZEyHpMruRSn6IKrxjtQZWy4uv/w6MzUeyBYG0OvNCiYpdvz5SkAGAUHD5ZNFqn2w\nKKFD0I2Dr59BFVSGJwIDAQAB\n-----END PUBLIC KEY-----"
+      JWT_PUBLIC_KEY: "-----BEGIN PUBLIC KEY-----\nMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCLW1tlHyKC9AG0hGpmkksET2DE\nr7ojSPemxFWAgFgcPJWQ7x3uNbsdJ3bIZFoA/FClaWKMCZmjnH9tv0bKZtY/CDhM\nZEyHpMruRSn6IKrxjtQZWy4uv/w6MzUeyBYG0OvNCiYpdvz5SkAGAUHD5ZNFqn2w\nKKFD0I2Dr59BFVSGJwIDAQAB\n-----END PUBLIC KEY-----"
+      JWT_ISSUER: pena-auth-service
+      JWT_AUDIENCE: pena
 
-      - ENCRYPT_PUBLIC_KEY=$USER_PKEY
+      ENCRYPT_PUBLIC_KEY: $USER_PKEY
-      - ENCRYPT_PRIVATE_KEY=$USER_PRIVATEKEY
+      ENCRYPT_PRIVATE_KEY: $USER_PRIVATEKEY
-      - ADMIN_FRONT_URL=https://sadmin.pena
+      ADMIN_FRONT_URL: https://sadmin.pena
-      - TRASH_LOG_HOST=10.7.0.5:7113
+      TRASH_LOG_HOST: 10.7.0.5:7113
-      - TELEGRAM_TOKEN=6112841016:AAH2nO1c6mqfMewBvHwdXCDp5PCclOuc99s
+      TELEGRAM_TOKEN: 6112841016:AAH2nO1c6mqfMewBvHwdXCDp5PCclOuc99s
     ports:
       - 10.7.0.6:8067:8065
       - 10.7.0.6:8070:8066

internal/initialize/config.go

@@ -4,15 +4,15 @@ import (
 	"time"
 
 	"gitea.pena/PenaSide/customer/internal/models"
-	"gitea.pena/PenaSide/customer/pkg/env"
+	"github.com/caarlos0/env/v8"
 	"github.com/golang-jwt/jwt/v5"
 )
 
 // TODO: обработать возможность читать конфиги ещё по json
 
 func Configuration(path string) (*models.Config, error) {
-	config, err := env.Parse[models.Config](path)
+	var cfg models.Config
-	if err != nil {
+	if err := env.Parse(&cfg); err != nil {
 		return nil, err
 	}
 
@@ -20,9 +20,9 @@ func Configuration(path string) (*models.Config, error) {
 	//	return nil, err
 	//}
 
-	iniJWTConfiguration(&config.ExternalCfg.JwtCfg)
+	iniJWTConfiguration(&cfg.ExternalCfg.JwtCfg)
 
-	return config, nil
+	return &cfg, nil
 }
 
 func iniJWTConfiguration(config *models.JWTConfiguration) {

internal/utils/jwt.go

@@ -19,6 +19,7 @@ type JWT struct {
 }
 
 func NewJWT(configuration *models.JWTConfiguration) *JWT {
+	fmt.Println("PKKKKK", configuration.PrivateKey)
 	return &JWT{
 		privateKey: []byte(configuration.PrivateKey),
 		publicKey:  []byte(configuration.PublicKey),