new_gate/ms-auth
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/feature/GAT-103' into develop

Browse source
This commit is contained in:
Vyacheslav1557 2025-04-12 21:58:00 +05:00
commit ac0f63c1db
6 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitmodules vendored
View file

@ -1,3 +1,3 @@
[submodule "proto"] [submodule "proto"]
path = proto path = contracts
url = https://git.sch9.ru/new_gate/contracts url = https://git.sch9.ru/new_gate/contracts

2
Makefile
View file

@ -1,7 +1,7 @@
tag = latest tag = latest
gen: gen:
@oapi-codegen --config=config.yaml ./proto/user/v1/openapi.yaml @oapi-codegen --config=config.yaml ./contracts/user/v1/openapi.yaml
dev: gen dev: gen
@go run cmd/ms-auth/main.go @go run cmd/ms-auth/main.go
build: gen build: gen

2
cmd/ms-auth/main.go
View file

@ -4,12 +4,12 @@ import (
"context" "context"
"fmt" "fmt"
"git.sch9.ru/new_gate/ms-auth/config" "git.sch9.ru/new_gate/ms-auth/config"
userv1 "git.sch9.ru/new_gate/ms-auth/contracts/user/v1"
"git.sch9.ru/new_gate/ms-auth/internal/models" "git.sch9.ru/new_gate/ms-auth/internal/models"
"git.sch9.ru/new_gate/ms-auth/internal/users/delivery/rest" "git.sch9.ru/new_gate/ms-auth/internal/users/delivery/rest"
usersRepository "git.sch9.ru/new_gate/ms-auth/internal/users/repository" usersRepository "git.sch9.ru/new_gate/ms-auth/internal/users/repository"
usersUseCase "git.sch9.ru/new_gate/ms-auth/internal/users/usecase" usersUseCase "git.sch9.ru/new_gate/ms-auth/internal/users/usecase"
"git.sch9.ru/new_gate/ms-auth/pkg" "git.sch9.ru/new_gate/ms-auth/pkg"
userv1 "git.sch9.ru/new_gate/ms-auth/proto/user/v1"
"github.com/gofiber/fiber/v2" "github.com/gofiber/fiber/v2"
fiberlogger "github.com/gofiber/fiber/v2/middleware/logger" fiberlogger "github.com/gofiber/fiber/v2/middleware/logger"
"github.com/ilyakaznacheev/cleanenv" "github.com/ilyakaznacheev/cleanenv"

2
config.yaml
View file

@ -2,4 +2,4 @@ package: userv1
generate: generate:
fiber-server: true fiber-server: true
models: true models: true
output: ./proto/user/v1/user.go output: ./contracts/user/v1/user.go

0
proto → contracts
View file

2
internal/users/delivery/rest/handlers.go
View file

@ -3,10 +3,10 @@ package rest
import ( import (
"encoding/base64" "encoding/base64"
"errors" "errors"
userv1 "git.sch9.ru/new_gate/ms-auth/contracts/user/v1"
"git.sch9.ru/new_gate/ms-auth/internal/models" "git.sch9.ru/new_gate/ms-auth/internal/models"
"git.sch9.ru/new_gate/ms-auth/internal/users" "git.sch9.ru/new_gate/ms-auth/internal/users"
"git.sch9.ru/new_gate/ms-auth/pkg" "git.sch9.ru/new_gate/ms-auth/pkg"
userv1 "git.sch9.ru/new_gate/ms-auth/proto/user/v1"
"github.com/gofiber/fiber/v2" "github.com/gofiber/fiber/v2"
"github.com/golang-jwt/jwt/v4" "github.com/golang-jwt/jwt/v4"
"strings" "strings"