fix taskfile
This commit is contained in:
parent
daa234acac
commit
21584efd73
1
.gitignore
vendored
1
.gitignore
vendored
@ -160,3 +160,4 @@ fabric.properties
|
|||||||
|
|
||||||
# End of https://www.toptal.com/developers/gitignore/api/visualstudiocode,goland,go
|
# End of https://www.toptal.com/developers/gitignore/api/visualstudiocode,goland,go
|
||||||
/recover.bolt
|
/recover.bolt
|
||||||
|
main
|
||||||
|
@ -3,8 +3,8 @@ version: "3"
|
|||||||
tasks:
|
tasks:
|
||||||
update-linter:
|
update-linter:
|
||||||
cmds:
|
cmds:
|
||||||
- go get -u penahub.gitlab.yandexcloud.net/devops/linters/golang.git
|
- go get -u gitea.pena/PenaSide/linters-golang
|
||||||
lint:
|
lint:
|
||||||
cmds:
|
cmds:
|
||||||
- task: update-linter
|
- task: update-linter
|
||||||
- cmd: golangci-lint run -v -c $(go list -f '{{"{{"}}.Dir{{"}}"}}' -m penahub.gitlab.yandexcloud.net/devops/linters/golang.git)/.golangci.yml
|
- cmd: golangci-lint run -v -c $(go list -f '{{"{{"}}.Dir{{"}}"}}' -m gitea.pena/PenaSide/linters-golang)/.golangci.yml
|
||||||
|
@ -8,25 +8,25 @@ services:
|
|||||||
APP_NAME: 'codeword'
|
APP_NAME: 'codeword'
|
||||||
CLIENT_HTTP_URL: '0.0.0.0:3000'
|
CLIENT_HTTP_URL: '0.0.0.0:3000'
|
||||||
ADMIN_HTTP_URL: '0.0.0.0:3001'
|
ADMIN_HTTP_URL: '0.0.0.0:3001'
|
||||||
MONGO_URL: mongodb://auth-service-user:LFYFpTvqtxSzXDJV@10.7.0.6:27017/?authSource=auth
|
MONGO_URL: mongodb://auth-service-user:LFYFpTvqtxSzXDJV@mongodb.pena:27017/?authSource=auth
|
||||||
ENCRYPT_PUBLIC_KEY: "-----BEGIN PUBLIC KEY-----\nMCowBQYDK2VwAyEAEbnIvjIMle4rqVol6K2XUqOxHy1KJoNoZdKJrRUPKL4=\n-----END PUBLIC KEY-----"
|
ENCRYPT_PUBLIC_KEY: "-----BEGIN PUBLIC KEY-----\nMCowBQYDK2VwAyEAEbnIvjIMle4rqVol6K2XUqOxHy1KJoNoZdKJrRUPKL4=\n-----END PUBLIC KEY-----"
|
||||||
ENCRYPT_PRIVATE_KEY: "-----BEGIN PRIVATE KEY-----\nMC4CAQAwBQYDK2VwBCIEIKn0BKwF3vZvODgWAnUIwQhd8de5oZhY48gc23EWfrfs\n-----END PRIVATE KEY-----"
|
ENCRYPT_PRIVATE_KEY: "-----BEGIN PRIVATE KEY-----\nMC4CAQAwBQYDK2VwBCIEIKn0BKwF3vZvODgWAnUIwQhd8de5oZhY48gc23EWfrfs\n-----END PRIVATE KEY-----"
|
||||||
ENCRYPT_SIGN_SECRET: 'pena-auth-microservice-group'
|
ENCRYPT_SIGN_SECRET: 'pena-auth-microservice-group'
|
||||||
REDIS_HOST: '10.7.0.6:6379'
|
REDIS_HOST: 'redis.pena:6379'
|
||||||
REDIS_PASSWORD: 'Redalert2'
|
REDIS_PASSWORD: 'Redalert2'
|
||||||
REDIS_DB: 3
|
REDIS_DB: 3
|
||||||
API_URL: 'https://api.smtp.bz/v1/smtp/send'
|
API_URL: 'https://api.smtp.bz/v1/smtp/send'
|
||||||
MAIL_API_KEY: 'P0YsjUB137upXrr1NiJefHmXVKW1hmBWlpev'
|
MAIL_API_KEY: 'P0YsjUB137upXrr1NiJefHmXVKW1hmBWlpev'
|
||||||
MAIL_SENDER: 'noreply@mailing.pena.digital'
|
MAIL_SENDER: 'noreply@mailing.pena.digital'
|
||||||
DEFAULT_REDIRECTION_URL: 'https://shub.pena.digital/'
|
DEFAULT_REDIRECTION_URL: 'https://shub.pena.digital/'
|
||||||
AUTH_EXCHANGE_URL: 'http://10.7.0.6:59300/auth/exchange'
|
AUTH_EXCHANGE_URL: 'http://10.7.0.4:59300/auth/exchange'
|
||||||
RECOVERY_URL: 'https://shub.pena.digital/codeword/v1.0.0/recover/'
|
RECOVERY_URL: 'https://shub.pena.digital/codeword/v1.0.0/recover/'
|
||||||
JWT_AUDIENCE: 'pena'
|
JWT_AUDIENCE: 'pena'
|
||||||
JWT_ISSUER: 'pena-auth-service'
|
JWT_ISSUER: 'pena-auth-service'
|
||||||
JWT_PUBLIC_KEY: $JWT_PUBLIC_KEY
|
JWT_PUBLIC_KEY: $JWT_PUBLIC_KEY
|
||||||
KAFKA_BROKERS: "10.7.0.6:9092"
|
KAFKA_BROKERS: "10.7.0.6:9092"
|
||||||
KAFKA_TOPIC_TARIFF: "tariffs"
|
KAFKA_TOPIC_TARIFF: "tariffs"
|
||||||
DISCOUNT_ADDRESS: "10.7.0.6:9001"
|
DISCOUNT_ADDRESS: "hubstaging.pena:9001"
|
||||||
GRPC_HOST: "0.0.0.0"
|
GRPC_HOST: "0.0.0.0"
|
||||||
TRASH_LOG_HOST: "10.7.0.5:7113"
|
TRASH_LOG_HOST: "10.7.0.5:7113"
|
||||||
ports:
|
ports:
|
||||||
|
@ -2,7 +2,6 @@ package client
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
"errors"
|
|
||||||
"fmt"
|
"fmt"
|
||||||
"gitea.pena/PenaSide/codeword/internal/models"
|
"gitea.pena/PenaSide/codeword/internal/models"
|
||||||
"github.com/gofiber/fiber/v2"
|
"github.com/gofiber/fiber/v2"
|
||||||
|
@ -3,7 +3,6 @@ package initialize
|
|||||||
import (
|
import (
|
||||||
"gitea.pena/PenaSide/common/mongo"
|
"gitea.pena/PenaSide/common/mongo"
|
||||||
"github.com/caarlos0/env/v8"
|
"github.com/caarlos0/env/v8"
|
||||||
"github.com/joho/godotenv"
|
|
||||||
"log"
|
"log"
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -48,9 +47,6 @@ type JWTConfiguration struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func LoadConfig() (*Config, error) {
|
func LoadConfig() (*Config, error) {
|
||||||
if err := godotenv.Load(); err != nil {
|
|
||||||
log.Print("No .env file found")
|
|
||||||
}
|
|
||||||
var config Config
|
var config Config
|
||||||
if err := env.Parse(&config); err != nil {
|
if err := env.Parse(&config); err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
|
Loading…
Reference in New Issue
Block a user