PenaSide/heruvym
3
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

merge commit ab89c0677d9d5f3e2812e9d881f661d45218faf9

Browse Source
This commit is contained in:
Pasha 2024-11-27 11:53:14 +03:00
commit fcfcadcbb6
14 changed files with 22 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitea/workflows/lint.yml
View File

@ -9,6 +9,6 @@ on:
jobs: jobs:
Lint: Lint:
runs-on: [hubstaging] runs-on: [hubstaging]
uses: http://gitea.pena/PenaDevops/actions.git/.gitea/workflows/lint.yml@v1.1.0 uses: http://gitea.pena/PenaDevops/actions.git/.gitea/workflows/lint.yml@v1.1.2
with: with:
runner: hubstaging runner: hubstaging

8
go.mod
View File

@ -3,8 +3,8 @@ module heruvym
go 1.23.2 go 1.23.2
require ( require (
gitea.pena/PenaSide/linters-golang v0.0.0-20241114215743-9a8e7d58cf96 gitea.pena/PenaSide/hlog v0.0.0-20241125221102-a54c29c002a9
gitea.pena/PenaSide/linters-golang.git v0.0.0-20241107123845-60e4981764af gitea.pena/PenaSide/linters-golang v0.0.0-20241119212350-2759fa93724a
github.com/caarlos0/env/v8 v8.0.0 github.com/caarlos0/env/v8 v8.0.0
github.com/dgrijalva/jwt-go v3.2.0+incompatible github.com/dgrijalva/jwt-go v3.2.0+incompatible
github.com/go-redis/redis/v8 v8.11.5 github.com/go-redis/redis/v8 v8.11.5
@ -15,7 +15,7 @@ require (
github.com/skeris/appInit v1.0.2 github.com/skeris/appInit v1.0.2
github.com/stretchr/testify v1.8.4 github.com/stretchr/testify v1.8.4
github.com/themakers/bdd v0.0.0-20210316111417-6b1dfe326f33 github.com/themakers/bdd v0.0.0-20210316111417-6b1dfe326f33
github.com/themakers/hlog v0.0.0-20191205140925-235e0e4baddf github.com/themakers/hlog v0.0.0-20191205140925-235e0e4baddf // indirect
go.mongodb.org/mongo-driver v1.13.1 go.mongodb.org/mongo-driver v1.13.1
go.uber.org/zap v1.27.0 go.uber.org/zap v1.27.0
gopkg.in/telebot.v3 v3.3.8 gopkg.in/telebot.v3 v3.3.8
@ -58,7 +58,7 @@ require (
github.com/xdg-go/stringprep v1.0.4 // indirect github.com/xdg-go/stringprep v1.0.4 // indirect
github.com/youmark/pkcs8 v0.0.0-20201027041543-1326539a0a0a // indirect github.com/youmark/pkcs8 v0.0.0-20201027041543-1326539a0a0a // indirect
go.etcd.io/bbolt v1.3.6 // indirect go.etcd.io/bbolt v1.3.6 // indirect
go.uber.org/multierr v1.10.0 // indirect go.uber.org/multierr v1.11.0 // indirect
golang.org/x/crypto v0.7.0 // indirect golang.org/x/crypto v0.7.0 // indirect
golang.org/x/net v0.8.0 // indirect golang.org/x/net v0.8.0 // indirect
golang.org/x/sync v0.1.0 // indirect golang.org/x/sync v0.1.0 // indirect

13
go.sum
View File

@ -1,4 +1,3 @@
cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU= cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU=
@ -55,10 +54,10 @@ cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RX
cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0= cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0=
cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3fOKtUw0Xmo= cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3fOKtUw0Xmo=
dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
gitea.pena/PenaSide/linters-golang.git v0.0.0-20241107123845-60e4981764af h1:g9U+JXUI9daAZbSw+uW+5tlEdkejdRUwbJxu6FMHi24= gitea.pena/PenaSide/hlog v0.0.0-20241125221102-a54c29c002a9 h1:tBkXWNIt8icmkMMnq8MA421RWkUy4OZh5P7C3q8uCu4=
gitea.pena/PenaSide/linters-golang.git v0.0.0-20241107123845-60e4981764af/go.mod h1:KOzb6hT9ASsvA6RB41GoQIwRhFr/U+f8jx3fnQsknXk= gitea.pena/PenaSide/hlog v0.0.0-20241125221102-a54c29c002a9/go.mod h1:sanhSL8aEsfcq21P+eItYiAnKAre+B67nGJmDfk2cf0=
gitea.pena/PenaSide/linters-golang v0.0.0-20241114215743-9a8e7d58cf96 h1:m4EMXEhsA/glI6eJeZnRGUhYPSQdcWj3hzT2IDNlWS0= gitea.pena/PenaSide/linters-golang v0.0.0-20241119212350-2759fa93724a h1:UySqMgaOKNsR42Y6GQXoM2wn/waYNc9cakMUSvbEEAg=
gitea.pena/PenaSide/linters-golang v0.0.0-20241114215743-9a8e7d58cf96/go.mod h1:gdd+vOT6up9STkEbxa2qESLIMZFjCmRbkcheFQCVgZU= gitea.pena/PenaSide/linters-golang v0.0.0-20241119212350-2759fa93724a/go.mod h1:gdd+vOT6up9STkEbxa2qESLIMZFjCmRbkcheFQCVgZU=
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
github.com/ClickHouse/clickhouse-go v1.5.4 h1:cKjXeYLNWVJIx2J1K6H2CqyRmfwVJVY1OV1coaaFcI0= github.com/ClickHouse/clickhouse-go v1.5.4 h1:cKjXeYLNWVJIx2J1K6H2CqyRmfwVJVY1OV1coaaFcI0=
@ -494,8 +493,8 @@ go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE= go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
go.uber.org/multierr v1.5.0/go.mod h1:FeouvMocqHpRaaGuG9EjoKcStLC43Zu/fmqdUMPcKYU= go.uber.org/multierr v1.5.0/go.mod h1:FeouvMocqHpRaaGuG9EjoKcStLC43Zu/fmqdUMPcKYU=
go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU=
go.uber.org/multierr v1.10.0 h1:S0h4aNzvfcFsC3dRF1jLoaov7oRaKqRGC/pUEJ2yvPQ= go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
go.uber.org/multierr v1.10.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA= go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA=
go.uber.org/zap v1.16.0/go.mod h1:MA8QOfq0BHJwdXa996Y4dYkAqRKB8/1K1QMMZVaNZjQ= go.uber.org/zap v1.16.0/go.mod h1:MA8QOfq0BHJwdXa996Y4dYkAqRKB8/1K1QMMZVaNZjQ=
go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo=

2
internal/app/app.go
View File

@ -3,7 +3,7 @@ package app
import ( import (
"context" "context"
"errors" "errors"
"github.com/themakers/hlog" "gitea.pena/PenaSide/hlog"
"go.uber.org/zap" "go.uber.org/zap"
"heruvym/internal/initialize" "heruvym/internal/initialize"
"heruvym/internal/server/http" "heruvym/internal/server/http"

2
internal/controllers/tickets/tickets.go
View File

@ -5,8 +5,8 @@ import (
"encoding/json" "encoding/json"
"errors" "errors"
"fmt" "fmt"
"gitea.pena/PenaSide/hlog"
"github.com/gofiber/fiber/v2" "github.com/gofiber/fiber/v2"
"github.com/themakers/hlog"
"go.uber.org/zap" "go.uber.org/zap"
"gopkg.in/telebot.v3" "gopkg.in/telebot.v3"
our_errors "heruvym/internal/controllers/errors" our_errors "heruvym/internal/controllers/errors"

2
internal/initialize/controllers.go
View File

@ -1,8 +1,8 @@
package initialize package initialize
import ( import (
"gitea.pena/PenaSide/hlog"
"github.com/go-redis/redis/v8" "github.com/go-redis/redis/v8"
"github.com/themakers/hlog"
"go.uber.org/zap" "go.uber.org/zap"
"gopkg.in/telebot.v3" "gopkg.in/telebot.v3"
"heruvym/internal/controllers/other" "heruvym/internal/controllers/other"

2
internal/initialize/repository.go
View File

@ -2,8 +2,8 @@ package initialize
import ( import (
"context" "context"
"gitea.pena/PenaSide/hlog"
minioClient "github.com/minio/minio-go/v7" minioClient "github.com/minio/minio-go/v7"
"github.com/themakers/hlog"
mongoDatabase "go.mongodb.org/mongo-driver/mongo" mongoDatabase "go.mongodb.org/mongo-driver/mongo"
"heruvym/internal/repository/minio" "heruvym/internal/repository/minio"
"heruvym/internal/repository/mongo" "heruvym/internal/repository/mongo"

2
internal/repository/minio/minio.go
View File

@ -6,8 +6,8 @@ import (
"io" "io"
"net/http" "net/http"
"gitea.pena/PenaSide/hlog"
"github.com/minio/minio-go/v7" "github.com/minio/minio-go/v7"
"github.com/themakers/hlog"
) )
type Deps struct { type Deps struct {

2
internal/repository/mongo/dal.go
View File

@ -8,7 +8,7 @@ import (
"time" "time"
"github.com/rs/xid" "github.com/rs/xid"
"github.com/themakers/hlog" "gitea.pena/PenaSide/hlog"
"go.mongodb.org/mongo-driver/bson" "go.mongodb.org/mongo-driver/bson"
"go.mongodb.org/mongo-driver/bson/primitive" "go.mongodb.org/mongo-driver/bson/primitive"
"go.mongodb.org/mongo-driver/mongo" "go.mongodb.org/mongo-driver/mongo"

2
internal/repository/mongo/dal_test.go
View File

@ -3,7 +3,7 @@ package mongo
import ( import (
"context" "context"
"github.com/stretchr/testify/suite" "github.com/stretchr/testify/suite"
"github.com/themakers/hlog" "gitea.pena/PenaSide/hlog"
"go.uber.org/zap" "go.uber.org/zap"
"heruvym/internal/model" "heruvym/internal/model"
"testing" "testing"

2
internal/server/http/http_server.go
View File

@ -3,8 +3,8 @@ package http
import ( import (
"context" "context"
"fmt" "fmt"
"gitea.pena/PenaSide/hlog"
"github.com/gofiber/fiber/v2" "github.com/gofiber/fiber/v2"
"github.com/themakers/hlog"
"go.uber.org/zap" "go.uber.org/zap"
"heruvym/internal/utils/middleware" "heruvym/internal/utils/middleware"
) )

2
internal/utils/middleware/http_middleware.go
View File

@ -7,8 +7,8 @@ import (
"strings" "strings"
"time" "time"
"gitea.pena/PenaSide/hlog"
"github.com/rs/xid" "github.com/rs/xid"
"github.com/themakers/hlog"
) )
// My MiddleWare with gorilla/mux // My MiddleWare with gorilla/mux

2
internal/utils/middleware/middleware.go
View File

@ -1,8 +1,8 @@
package middleware package middleware
import ( import (
"gitea.pena/PenaSide/hlog"
"github.com/gofiber/fiber/v2" "github.com/gofiber/fiber/v2"
"github.com/themakers/hlog"
"heruvym/internal/utils/jwt_adapter" "heruvym/internal/utils/jwt_adapter"
) )

2
version/version.go
View File

@ -7,4 +7,4 @@ var (
Commit = "unset" Commit = "unset"
// Release is a semantic version of current build // Release is a semantic version of current build
Release = "unset" Release = "unset"
) )