diff --git a/Makefile b/Makefile index aa63390e..361980d1 100644 --- a/Makefile +++ b/Makefile @@ -22,7 +22,7 @@ clean: swag: @echo Generating swagger docs... - swag init -g ./cloudsdale.go -o ./api + swag init -g ./cmd/cloudsdale/main.go -o ./api @echo Swagger docs generated. build: swag @@ -32,5 +32,5 @@ build: swag run: swag @echo Running $(PACKAGE)... - go run -ldflags "$(LDFLAGS)" $(PACKAGE) + go run -ldflags "$(LDFLAGS)" $(PACKAGE)/cmd/cloudsdale @echo Run finished. \ No newline at end of file diff --git a/cloudsdale.go b/cmd/cloudsdale/main.go similarity index 100% rename from cloudsdale.go rename to cmd/cloudsdale/main.go diff --git a/internal/app/app.go b/internal/app/app.go index bbca4709..9922114f 100644 --- a/internal/app/app.go +++ b/internal/app/app.go @@ -2,16 +2,15 @@ package app import ( "fmt" - "github.com/TwiN/go-color" _ "github.com/elabosak233/cloudsdale/api" + "github.com/elabosak233/cloudsdale/internal/app/assets" + "github.com/elabosak233/cloudsdale/internal/app/config" + "github.com/elabosak233/cloudsdale/internal/app/db" + "github.com/elabosak233/cloudsdale/internal/app/logger" + "github.com/elabosak233/cloudsdale/internal/app/logger/adapter" "github.com/elabosak233/cloudsdale/internal/controller" - "github.com/elabosak233/cloudsdale/internal/extension/assets" "github.com/elabosak233/cloudsdale/internal/extension/casbin" - "github.com/elabosak233/cloudsdale/internal/extension/config" "github.com/elabosak233/cloudsdale/internal/extension/container/provider" - "github.com/elabosak233/cloudsdale/internal/extension/database" - "github.com/elabosak233/cloudsdale/internal/extension/logger" - "github.com/elabosak233/cloudsdale/internal/extension/logger/adapter" "github.com/elabosak233/cloudsdale/internal/global" "github.com/elabosak233/cloudsdale/internal/middleware" "github.com/elabosak233/cloudsdale/internal/repository" @@ -26,6 +25,7 @@ import ( swaggerFiles "github.com/swaggo/files" ginSwagger "github.com/swaggo/gin-swagger" "go.uber.org/zap" + "html/template" "net/http" "os" "strconv" @@ -34,10 +34,14 @@ import ( func init() { data, _ := assets.ReadStaticFile("banner.txt") banner := string(data) - fmt.Printf("\n%s\n", banner) - fmt.Printf("%s %s\n", color.InBold("Git Commit:"), color.InBold(global.GitCommitID)) - fmt.Printf("%s %s\n", color.InBold("Issues:"), color.InBold("https://github.com/elabosak233/Cloudsdale/issues")) - fmt.Printf("%s %s\n\n", color.InBold("License:"), color.InBold("GNU GENERAL PUBLIC LICENSE Version 3")) + t, _ := template.New("cloudsdale").Parse(banner) + _ = t.Execute(os.Stdout, struct { + Version string + Commit string + }{ + Version: global.GitTag, + Commit: global.GitCommitID, + }) } func Run() { @@ -45,14 +49,14 @@ func Run() { logger.InitLogger() config.InitConfig() assets.InitAssets() - database.InitDatabase() + db.InitDatabase() casbin.InitCasbin() provider.InitContainerProvider() // Debug mode isDebug := convertor.ToBoolD(os.Getenv("DEBUG"), false) if isDebug { - database.Debug() + db.Debug() gin.SetMode(gin.DebugMode) } else { gin.SetMode(gin.ReleaseMode) diff --git a/internal/extension/assets/assets.go b/internal/app/assets/assets.go similarity index 94% rename from internal/extension/assets/assets.go rename to internal/app/assets/assets.go index 488a285d..6d0894cb 100644 --- a/internal/extension/assets/assets.go +++ b/internal/app/assets/assets.go @@ -2,7 +2,7 @@ package assets import ( "fmt" - "github.com/elabosak233/cloudsdale/internal/extension/config" + "github.com/elabosak233/cloudsdale/internal/app/config" "github.com/elabosak233/cloudsdale/internal/extension/files" "os" ) diff --git a/internal/extension/config/application.go b/internal/app/config/application.go similarity index 100% rename from internal/extension/config/application.go rename to internal/app/config/application.go diff --git a/internal/extension/config/config.go b/internal/app/config/config.go similarity index 100% rename from internal/extension/config/config.go rename to internal/app/config/config.go diff --git a/internal/extension/config/platform.go b/internal/app/config/platform.go similarity index 100% rename from internal/extension/config/platform.go rename to internal/app/config/platform.go diff --git a/internal/extension/config/signature.go b/internal/app/config/signature.go similarity index 100% rename from internal/extension/config/signature.go rename to internal/app/config/signature.go diff --git a/internal/extension/database/database.go b/internal/app/db/db.go similarity index 74% rename from internal/extension/database/database.go rename to internal/app/db/db.go index 1ebe2a6d..b3d5d66c 100644 --- a/internal/extension/database/database.go +++ b/internal/app/db/db.go @@ -1,9 +1,9 @@ -package database +package db import ( "fmt" - "github.com/elabosak233/cloudsdale/internal/extension/config" - "github.com/elabosak233/cloudsdale/internal/extension/logger/adapter" + "github.com/elabosak233/cloudsdale/internal/app/config" + "github.com/elabosak233/cloudsdale/internal/app/logger/adapter" "github.com/elabosak233/cloudsdale/internal/model" "go.uber.org/zap" "golang.org/x/crypto/bcrypt" @@ -17,24 +17,33 @@ import ( var db *gorm.DB var dbInfo string +func Db() *gorm.DB { + return db +} + +// InitDatabase initializes the database connection and performs the necessary migrations. func InitDatabase() { initDatabaseEngine() zap.L().Info(fmt.Sprintf("Database Connect Information: %s", dbInfo)) db.Logger = adapter.NewGORMAdapter(zap.L()) - syncDatabase() + migrate() initAdmin() - initCategory() + initDefaultCategories() selfCheck() } -func Db() *gorm.DB { - return db -} - +// Debug enables the debug mode of the database connection. func Debug() { db = db.Debug() } +// initDatabaseEngine initializes the database connection engine. +// It supports PostgreSQL, MySQL, and SQLite. +// The connection information is read from the configuration file. +// The connection information is formatted according to the database type. +// The connection is established using the GORM library. +// The database connection is stored in the global variable db. +// If an error occurs during the connection, the program will exit. func initDatabaseEngine() { var err error switch config.AppCfg().Db.Provider { @@ -68,7 +77,9 @@ func initDatabaseEngine() { } } -func syncDatabase() { +// migrate performs the necessary migrations. +// It creates the tables if they do not exist. +func migrate() { err := db.AutoMigrate( &model.User{}, &model.Category{}, @@ -94,8 +105,11 @@ func syncDatabase() { } } +// selfCheck performs a self-check. +// It updates the removed_at field of the Pod table. +// If the removed_at field is greater than the current time, it is forcibly assigned the current time. +// This is to prevent subsequent program errors in judgment. func selfCheck() { - // 对于 pods 中的所有数据，若 removed_at 大于当前时间，则强制赋值为现在的时间，以免后续程序错误判断 db.Model(&model.Pod{}).Where("removed_at > ?", time.Now().UnixMilli()).Update("removed_at", time.Now().UnixMilli()) } @@ -121,7 +135,9 @@ func initAdmin() { } } -func initCategory() { +// initDefaultCategories initializes the default categories. +// If the categories do not exist, they will be created. +func initDefaultCategories() { var count int64 db.Model(&model.Category{}).Count(&count) if count == 0 { diff --git a/internal/extension/logger/adapter/gin.go b/internal/app/logger/adapter/gin.go similarity index 100% rename from internal/extension/logger/adapter/gin.go rename to internal/app/logger/adapter/gin.go diff --git a/internal/extension/logger/adapter/gorm.go b/internal/app/logger/adapter/gorm.go similarity index 100% rename from internal/extension/logger/adapter/gorm.go rename to internal/app/logger/adapter/gorm.go diff --git a/internal/extension/logger/encoder.go b/internal/app/logger/encoder.go similarity index 100% rename from internal/extension/logger/encoder.go rename to internal/app/logger/encoder.go diff --git a/internal/extension/logger/logger.go b/internal/app/logger/logger.go similarity index 100% rename from internal/extension/logger/logger.go rename to internal/app/logger/logger.go diff --git a/internal/cache/cache.go b/internal/cache/cache.go new file mode 100644 index 00000000..cf38e38b --- /dev/null +++ b/internal/cache/cache.go @@ -0,0 +1,10 @@ +package cache + +type ICache interface { + Get(key string) (value string, err error) + Set(key string, value string, expire int) (err error) +} + +func NewCache() ICache { + return nil +} diff --git a/internal/cache/memory.go b/internal/cache/memory.go new file mode 100644 index 00000000..6e8aa2cb --- /dev/null +++ b/internal/cache/memory.go @@ -0,0 +1,7 @@ +package cache + +type MemoryCache struct{} + +func NewMemoryCache() ICache { + return nil +} diff --git a/internal/cache/redis.go b/internal/cache/redis.go new file mode 100644 index 00000000..3008aab1 --- /dev/null +++ b/internal/cache/redis.go @@ -0,0 +1,7 @@ +package cache + +type RedisCache struct{} + +func NewRedisCache() ICache { + return nil +} diff --git a/internal/controller/media.go b/internal/controller/media.go index fddb0d07..370fbc7d 100644 --- a/internal/controller/media.go +++ b/internal/controller/media.go @@ -1,7 +1,7 @@ package controller import ( - "github.com/elabosak233/cloudsdale/internal/extension/config" + "github.com/elabosak233/cloudsdale/internal/app/config" "github.com/elabosak233/cloudsdale/internal/service" "github.com/gin-gonic/gin" "net/http" diff --git a/internal/extension/captcha/captcha.go b/internal/extension/captcha/captcha.go index 5976e97c..ffc1ca7d 100644 --- a/internal/extension/captcha/captcha.go +++ b/internal/extension/captcha/captcha.go @@ -1,7 +1,7 @@ package captcha import ( - "github.com/elabosak233/cloudsdale/internal/extension/config" + "github.com/elabosak233/cloudsdale/internal/app/config" ) type ICaptcha interface { diff --git a/internal/extension/captcha/recaptcha.go b/internal/extension/captcha/recaptcha.go index cad815e6..2e683796 100644 --- a/internal/extension/captcha/recaptcha.go +++ b/internal/extension/captcha/recaptcha.go @@ -3,7 +3,7 @@ package captcha import ( "bytes" "encoding/json" - "github.com/elabosak233/cloudsdale/internal/extension/config" + "github.com/elabosak233/cloudsdale/internal/app/config" "io" "net/http" ) diff --git a/internal/extension/captcha/turnstile.go b/internal/extension/captcha/turnstile.go index 4474c54f..bac4370c 100644 --- a/internal/extension/captcha/turnstile.go +++ b/internal/extension/captcha/turnstile.go @@ -2,7 +2,7 @@ package captcha import ( "bytes" - "github.com/elabosak233/cloudsdale/internal/extension/config" + "github.com/elabosak233/cloudsdale/internal/app/config" "io" "k8s.io/apimachinery/pkg/util/json" "net/http" diff --git a/internal/extension/casbin/casbin.go b/internal/extension/casbin/casbin.go index b76ae549..06b1b452 100644 --- a/internal/extension/casbin/casbin.go +++ b/internal/extension/casbin/casbin.go @@ -4,7 +4,7 @@ import ( "github.com/casbin/casbin/v2" "github.com/casbin/casbin/v2/model" gormadapter "github.com/casbin/gorm-adapter/v3" - "github.com/elabosak233/cloudsdale/internal/extension/database" + "github.com/elabosak233/cloudsdale/internal/app/db" "github.com/elabosak233/cloudsdale/internal/extension/files" "go.uber.org/zap" ) @@ -15,7 +15,7 @@ var ( func InitCasbin() { adapter, err := gormadapter.NewAdapterByDBWithCustomTable( - database.Db(), + db.Db(), &gormadapter.CasbinRule{}, "casbins", ) diff --git a/internal/extension/container/manager/docker.go b/internal/extension/container/manager/docker.go index 4013016e..f86ef519 100644 --- a/internal/extension/container/manager/docker.go +++ b/internal/extension/container/manager/docker.go @@ -7,7 +7,7 @@ import ( ctn "github.com/docker/docker/api/types/container" "github.com/docker/docker/client" "github.com/docker/go-connections/nat" - "github.com/elabosak233/cloudsdale/internal/extension/config" + "github.com/elabosak233/cloudsdale/internal/app/config" "github.com/elabosak233/cloudsdale/internal/extension/container/provider" "github.com/elabosak233/cloudsdale/internal/extension/proxy" "github.com/elabosak233/cloudsdale/internal/model" diff --git a/internal/extension/container/manager/k8s.go b/internal/extension/container/manager/k8s.go index 5f945ce7..839a666c 100644 --- a/internal/extension/container/manager/k8s.go +++ b/internal/extension/container/manager/k8s.go @@ -5,7 +5,7 @@ import ( "errors" "fmt" "github.com/TwiN/go-color" - "github.com/elabosak233/cloudsdale/internal/extension/config" + "github.com/elabosak233/cloudsdale/internal/app/config" "github.com/elabosak233/cloudsdale/internal/extension/container/provider" "github.com/elabosak233/cloudsdale/internal/model" "github.com/elabosak233/cloudsdale/internal/utils/generator" diff --git a/internal/extension/container/manager/manager.go b/internal/extension/container/manager/manager.go index 8368894d..54e15385 100644 --- a/internal/extension/container/manager/manager.go +++ b/internal/extension/container/manager/manager.go @@ -1,7 +1,7 @@ package manager import ( - "github.com/elabosak233/cloudsdale/internal/extension/config" + "github.com/elabosak233/cloudsdale/internal/app/config" "github.com/elabosak233/cloudsdale/internal/model" "time" ) diff --git a/internal/extension/container/provider/docker.go b/internal/extension/container/provider/docker.go index 40122d14..1ec86ea1 100644 --- a/internal/extension/container/provider/docker.go +++ b/internal/extension/container/provider/docker.go @@ -5,7 +5,7 @@ import ( "fmt" "github.com/TwiN/go-color" "github.com/docker/docker/client" - "github.com/elabosak233/cloudsdale/internal/extension/config" + "github.com/elabosak233/cloudsdale/internal/app/config" "go.uber.org/zap" ) diff --git a/internal/extension/container/provider/k8s.go b/internal/extension/container/provider/k8s.go index f55dd820..0ca35d69 100644 --- a/internal/extension/container/provider/k8s.go +++ b/internal/extension/container/provider/k8s.go @@ -3,7 +3,7 @@ package provider import ( "fmt" "github.com/TwiN/go-color" - "github.com/elabosak233/cloudsdale/internal/extension/config" + "github.com/elabosak233/cloudsdale/internal/app/config" "go.uber.org/zap" "k8s.io/client-go/kubernetes" "k8s.io/client-go/tools/clientcmd" diff --git a/internal/extension/container/provider/provider.go b/internal/extension/container/provider/provider.go index 3ed4a842..496fa798 100644 --- a/internal/extension/container/provider/provider.go +++ b/internal/extension/container/provider/provider.go @@ -1,7 +1,7 @@ package provider import ( - "github.com/elabosak233/cloudsdale/internal/extension/config" + "github.com/elabosak233/cloudsdale/internal/app/config" "go.uber.org/zap" ) diff --git a/internal/extension/files/statics/banner.txt b/internal/extension/files/statics/banner.txt index 03caa5c0..eb7077fa 100644 --- a/internal/extension/files/statics/banner.txt +++ b/internal/extension/files/statics/banner.txt @@ -1,6 +1,9 @@ - ██████╗ ██╗ ██████╗ ██╗ ██╗██████╗ ███████╗██████╗ █████╗ ██╗███████╗ -██╔════╝███║██╔═████╗██║ ██║██╔══██╗██╔════╝██╔══██╗██╔══██╗███║██╔════╝ -██║ ╚██║██║██╔██║██║ ██║██║ ██║███████╗██║ ██║███████║╚██║█████╗ -██║ ██║████╔╝██║██║ ██║██║ ██║╚════██║██║ ██║██╔══██║ ██║██╔══╝ -╚██████╗ ██║╚██████╔╝╚██████╔╝██████╔╝███████║██████╔╝██║ ██║ ██║███████╗ - ╚═════╝ ╚═╝ ╚═════╝ ╚═════╝ ╚═════╝ ╚══════╝╚═════╝ ╚═╝ ╚═╝ ╚═╝╚══════╝ + _ _ _ _ + ___/ | ___ _ _ __| |___ __| | __ _/ | ___ + / __| |/ _ \| | | |/ _` / __|/ _` |/ _` | |/ _ \ +| (__| | (_) | |_| | (_| \__ \ (_| | (_| | | __/ + \___|_|\___/ \__,_|\__,_|___/\__,_|\__,_|_|\___| + Version {{.Version}} +Commit: {{.Commit}} +GitHub: https://github.com/elabosak233/cloudsdale + diff --git a/internal/extension/proxy/proxy.go b/internal/extension/proxy/proxy.go index 4025210b..f5279d0b 100644 --- a/internal/extension/proxy/proxy.go +++ b/internal/extension/proxy/proxy.go @@ -1,7 +1,7 @@ package proxy import ( - "github.com/elabosak233/cloudsdale/internal/extension/config" + "github.com/elabosak233/cloudsdale/internal/app/config" ) type IProxy interface { diff --git a/internal/extension/proxy/tcp.go b/internal/extension/proxy/tcp.go index af962c8d..8b19422c 100644 --- a/internal/extension/proxy/tcp.go +++ b/internal/extension/proxy/tcp.go @@ -3,7 +3,7 @@ package proxy import ( "errors" "fmt" - "github.com/elabosak233/cloudsdale/internal/extension/config" + "github.com/elabosak233/cloudsdale/internal/app/config" "github.com/google/gopacket" "github.com/google/gopacket/layers" "github.com/google/gopacket/pcapgo" diff --git a/internal/extension/proxy/ws.go b/internal/extension/proxy/ws.go index 1c17c602..281e644c 100644 --- a/internal/extension/proxy/ws.go +++ b/internal/extension/proxy/ws.go @@ -2,7 +2,7 @@ package proxy import ( "fmt" - "github.com/elabosak233/cloudsdale/internal/extension/config" + "github.com/elabosak233/cloudsdale/internal/app/config" "github.com/google/gopacket" "github.com/google/gopacket/layers" "github.com/google/gopacket/pcapgo" diff --git a/internal/middleware/casbin.go b/internal/middleware/casbin.go index 7b96ce27..bb5fc349 100644 --- a/internal/middleware/casbin.go +++ b/internal/middleware/casbin.go @@ -1,8 +1,8 @@ package middleware import ( + "github.com/elabosak233/cloudsdale/internal/app/config" "github.com/elabosak233/cloudsdale/internal/extension/casbin" - "github.com/elabosak233/cloudsdale/internal/extension/config" "github.com/elabosak233/cloudsdale/internal/model" "github.com/elabosak233/cloudsdale/internal/model/request" "github.com/elabosak233/cloudsdale/internal/service" diff --git a/internal/model/challenge.go b/internal/model/challenge.go index 07f8e07e..8c02bdd4 100644 --- a/internal/model/challenge.go +++ b/internal/model/challenge.go @@ -2,7 +2,7 @@ package model import ( "fmt" - "github.com/elabosak233/cloudsdale/internal/extension/config" + "github.com/elabosak233/cloudsdale/internal/app/config" "gorm.io/gorm" "os" "path" diff --git a/internal/model/game.go b/internal/model/game.go index d94b63ce..ac3ea9a7 100644 --- a/internal/model/game.go +++ b/internal/model/game.go @@ -2,7 +2,7 @@ package model import ( "fmt" - "github.com/elabosak233/cloudsdale/internal/extension/config" + "github.com/elabosak233/cloudsdale/internal/app/config" "gorm.io/gorm" "os" "path" diff --git a/internal/model/team.go b/internal/model/team.go index 4213f587..bd2dd744 100644 --- a/internal/model/team.go +++ b/internal/model/team.go @@ -2,7 +2,7 @@ package model import ( "fmt" - "github.com/elabosak233/cloudsdale/internal/extension/config" + "github.com/elabosak233/cloudsdale/internal/app/config" "gorm.io/gorm" "os" "path" diff --git a/internal/model/user.go b/internal/model/user.go index dfca6cb6..995f356f 100644 --- a/internal/model/user.go +++ b/internal/model/user.go @@ -2,7 +2,7 @@ package model import ( "fmt" - config2 "github.com/elabosak233/cloudsdale/internal/extension/config" + "github.com/elabosak233/cloudsdale/internal/app/config" "github.com/elabosak233/cloudsdale/internal/utils/signature" "gorm.io/gorm" "os" @@ -30,7 +30,7 @@ func (u *User) Simplify() { } func (u *User) AfterFind(db *gorm.DB) (err error) { - p := path.Join(config2.AppCfg().Gin.Paths.Media, "users", fmt.Sprintf("%d", u.ID)) + p := path.Join(config.AppCfg().Gin.Paths.Media, "users", fmt.Sprintf("%d", u.ID)) var name string var size int64 if files, _err := os.ReadDir(p); _err == nil { @@ -52,7 +52,7 @@ func (u *User) AfterFind(db *gorm.DB) (err error) { // AfterCreate Hook // Since the PrivateKey used here belongs to the entire Cloudsdale, it relies on GORM Hooks to write the Signature. func (u *User) AfterCreate(db *gorm.DB) (err error) { - sig, _ := signature.Sign(config2.SigCfg().PrivateKey, strconv.Itoa(int(u.ID))) + sig, _ := signature.Sign(config.SigCfg().PrivateKey, strconv.Itoa(int(u.ID))) u.Signature = fmt.Sprintf("%s:%s", strconv.Itoa(int(u.ID)), sig) return db.Table("users").Updates(&u).Error } diff --git a/internal/repository/repository.go b/internal/repository/repository.go index 24b8d156..4209ec6f 100644 --- a/internal/repository/repository.go +++ b/internal/repository/repository.go @@ -1,7 +1,7 @@ package repository import ( - "github.com/elabosak233/cloudsdale/internal/extension/database" + "github.com/elabosak233/cloudsdale/internal/app/db" "go.uber.org/zap" "sync" ) @@ -37,7 +37,7 @@ func R() *Repository { func InitRepository() { onceRepository.Do(func() { - db := database.Db() + db := db.Db() r = &Repository{ UserRepository: NewUserRepository(db), diff --git a/internal/service/config.go b/internal/service/config.go index 0acd68f4..2d988db5 100644 --- a/internal/service/config.go +++ b/internal/service/config.go @@ -1,7 +1,7 @@ package service import ( - "github.com/elabosak233/cloudsdale/internal/extension/config" + "github.com/elabosak233/cloudsdale/internal/app/config" "github.com/elabosak233/cloudsdale/internal/model/request" "github.com/elabosak233/cloudsdale/internal/repository" ) diff --git a/internal/service/media.go b/internal/service/media.go index 4a7e6759..980a39d0 100644 --- a/internal/service/media.go +++ b/internal/service/media.go @@ -2,7 +2,7 @@ package service import ( "fmt" - "github.com/elabosak233/cloudsdale/internal/extension/config" + "github.com/elabosak233/cloudsdale/internal/app/config" "io" "mime/multipart" "os" diff --git a/internal/service/pod.go b/internal/service/pod.go index e0e56485..50e619b1 100644 --- a/internal/service/pod.go +++ b/internal/service/pod.go @@ -3,7 +3,7 @@ package service import ( "errors" "fmt" - "github.com/elabosak233/cloudsdale/internal/extension/config" + "github.com/elabosak233/cloudsdale/internal/app/config" "github.com/elabosak233/cloudsdale/internal/extension/container/manager" "github.com/elabosak233/cloudsdale/internal/model" "github.com/elabosak233/cloudsdale/internal/model/request" diff --git a/internal/service/user.go b/internal/service/user.go index 71c493d5..c54fd64b 100644 --- a/internal/service/user.go +++ b/internal/service/user.go @@ -2,8 +2,8 @@ package service import ( "errors" + "github.com/elabosak233/cloudsdale/internal/app/config" "github.com/elabosak233/cloudsdale/internal/extension/captcha" - config2 "github.com/elabosak233/cloudsdale/internal/extension/config" "github.com/elabosak233/cloudsdale/internal/model" "github.com/elabosak233/cloudsdale/internal/model/request" "github.com/elabosak233/cloudsdale/internal/repository" @@ -40,17 +40,17 @@ func NewUserService(appRepository *repository.Repository) IUserService { } func (t *UserService) GetJwtTokenByID(user model.User) (tokenString string, err error) { - jwtSecretKey := []byte(config2.JwtSecretKey()) + jwtSecretKey := []byte(config.JwtSecretKey()) pgsToken := jwt.NewWithClaims(jwt.SigningMethodHS256, jwt.MapClaims{ "user_id": user.ID, - "exp": time.Now().Add(time.Duration(config2.AppCfg().Gin.Jwt.Expiration) * time.Minute).Unix(), + "exp": time.Now().Add(time.Duration(config.AppCfg().Gin.Jwt.Expiration) * time.Minute).Unix(), }) return pgsToken.SignedString(jwtSecretKey) } func (t *UserService) GetIDByJwtToken(token string) (id uint, err error) { pgsToken, err := jwt.Parse(token, func(token *jwt.Token) (interface{}, error) { - return []byte(config2.JwtSecretKey()), nil + return []byte(config.JwtSecretKey()), nil }) if err != nil { return 0, err @@ -78,7 +78,7 @@ func (t *UserService) Create(req request.UserCreateRequest) (err error) { func (t *UserService) Register(req request.UserRegisterRequest) (err error) { hashedPassword, _ := bcrypt.GenerateFromPassword([]byte(req.Password), bcrypt.DefaultCost) success := true - if config2.AppCfg().Captcha.Enabled { + if config.AppCfg().Captcha.Enabled { capt := captcha.NewCaptcha() success, err = capt.Verify(req.CaptchaToken, req.RemoteIP) }