From 566965bb6a4b975b668d0a4364314fffb2a86440 Mon Sep 17 00:00:00 2001 From: Nite07 Date: Wed, 24 Apr 2024 12:51:37 +0800 Subject: [PATCH] :recycle: Migrate from gorm/sqlite to boltdb --- .gitignore | 2 +- .goreleaser.yaml | 48 +++++---- .vscode/launch.json | 2 +- api/handler/short_link.go | 191 ++++++++++++++++-------------------- api/route.go | 34 +------ common/database/database.go | 85 +++++++++------- common/mkdir.go | 3 + common/sub.go | 9 +- go.mod | 15 +-- go.sum | 54 +--------- model/short_link.go | 2 +- validator/short_link.go | 2 +- 12 files changed, 183 insertions(+), 264 deletions(-) diff --git a/.gitignore b/.gitignore index dc28154..f36c9c0 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,6 @@ dist subs logs -sub2clash.db +data .env .vscode/settings.json \ No newline at end of file diff --git a/.goreleaser.yaml b/.goreleaser.yaml index 580879e..2dcbb99 100644 --- a/.goreleaser.yaml +++ b/.goreleaser.yaml @@ -1,24 +1,30 @@ project_name: sub2clash builds: - - env: - - CGO_ENABLED=0 - goos: - - windows - - linux - - darwin - goarch: - - amd64 - ldflags: - - -s -w -X sub2clash/constant.Version={{ .Version }} - flags: - - -trimpath + - env: + - CGO_ENABLED=0 + goos: + - windows + - linux + - darwin + goarch: + - amd64 + - arm64 + - arm + - "386" + goarm: + - "6" + - "7" + ldflags: + - -s -w -X sub2clash/constant.Version={{ .Version }} + flags: + - -trimpath archives: - - format: tar.gz - format_overrides: - - format: zip - goos: windows - wrap_in_directory: true - files: - - LICENSE - - README.md - - templates + - format: tar.gz + format_overrides: + - format: zip + goos: windows + wrap_in_directory: true + files: + - LICENSE + - README.md + - templates diff --git a/.vscode/launch.json b/.vscode/launch.json index 04e0bd1..1c3564c 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -7,7 +7,7 @@ "mode": "debug", "program": "${workspaceFolder}/main.go", "output": "${workspaceFolder}/dist/main.exe", - "buildFlags": "-ldflags '-X sub2clash/config.Version=dev'" + "buildFlags": "-ldflags '-X sub2clash/constant.Version=dev'" } ] } diff --git a/api/handler/short_link.go b/api/handler/short_link.go index bc90288..0e87a19 100644 --- a/api/handler/short_link.go +++ b/api/handler/short_link.go @@ -1,160 +1,137 @@ package handler import ( - "errors" "io" "net/http" "strconv" "strings" + "time" + "sub2clash/common" "sub2clash/common/database" "sub2clash/config" - "sub2clash/logger" "sub2clash/model" "sub2clash/validator" - "time" "github.com/gin-gonic/gin" - "go.uber.org/zap" - "gorm.io/gorm" ) -func ShortLinkGenHandler(c *gin.Context) { - // 从请求中获取参数 +func respondWithError(c *gin.Context, code int, message string) { + c.String(code, message) + c.Abort() +} + +func GenerateLinkHandler(c *gin.Context) { var params validator.ShortLinkGenValidator if err := c.ShouldBind(¶ms); err != nil { - c.String(400, "参数错误: "+err.Error()) + respondWithError(c, http.StatusBadRequest, "参数错误: "+err.Error()) + return } if strings.TrimSpace(params.Url) == "" { - c.String(400, "参数错误") + respondWithError(c, http.StatusBadRequest, "URL 不能为空") return } - // 生成hash - hash := common.RandomString(config.Default.ShortLinkLength) - var item model.ShortLink - result := database.FindShortLinkByUrl(params.Url, &item) - if result.Error == nil { - if item.Password != params.Password { - item.Password = params.Password - database.SaveShortLink(&item) - c.String(200, item.Hash+"?password="+params.Password) - } else { - c.String(200, item.Hash) - } + + hash, err := generateUniqueHash() + if err != nil { + respondWithError(c, http.StatusInternalServerError, "生成短链接失败") return - } else { - if !errors.Is(result.Error, gorm.ErrRecordNotFound) { - c.String(500, "数据库错误: "+result.Error.Error()) - return - } } - // 如果记录存在则重新生成hash，直到记录不存在 - result = database.FindShortLinkByHash(hash, &item) - for result.Error == nil { - hash = common.RandomString(config.Default.ShortLinkLength) - result = database.FindShortLinkByHash(hash, &item) + + shortLink := model.ShortLink{ + Hash: hash, + Url: params.Url, + Password: params.Password, } - // 创建记录 - database.FirstOrCreateShortLink( - &model.ShortLink{ - Hash: hash, - Url: params.Url, - LastRequestTime: -1, - Password: params.Password, - }, - ) - // 返回短链接 + + if err := database.SaveShortLink(&shortLink); err != nil { + respondWithError(c, http.StatusInternalServerError, "数据库错误") + return + } + if params.Password != "" { hash += "?password=" + params.Password } - c.String(200, hash) + c.String(http.StatusOK, hash) } -func ShortLinkGetUrlHandler(c *gin.Context) { - var params validator.ShortLinkGetValidator - if err := c.ShouldBindQuery(¶ms); err != nil { - c.String(400, "参数错误: "+err.Error()) - return +func generateUniqueHash() (string, error) { + for { + hash := common.RandomString(config.Default.ShortLinkLength) + exists, err := database.CheckShortLinkHashExists(hash) + if err != nil { + return "", err + } + if !exists { + return hash, nil + } } - if strings.TrimSpace(params.Hash) == "" { - c.String(400, "参数错误") - return - } - var shortLink model.ShortLink - result := database.FindShortLinkByHash(params.Hash, &shortLink) - if result.Error != nil { - c.String(404, "未找到短链接") - return - } - if shortLink.Password != "" && shortLink.Password != params.Password { - c.String(403, "密码错误") - return - } - c.String(200, shortLink.Url) } -func ShortLinkGetConfigHandler(c *gin.Context) { - // 获取动态路由 +func UpdateLinkHandler(c *gin.Context) { + var params validator.ShortLinkUpdateValidator + if err := c.ShouldBindJSON(¶ms); err != nil { + respondWithError(c, http.StatusBadRequest, "参数错误: "+err.Error()) + return + } + shortLink := model.ShortLink{ + Hash: params.Hash, + Url: params.Url, + Password: params.Password, + } + if err := database.SaveShortLink(&shortLink); err != nil { + respondWithError(c, http.StatusInternalServerError, "数据库错误") + return + } + + c.String(http.StatusOK, "短链接更新成功") +} + +func GetRawConfHandler(c *gin.Context) { + // 获取动态路由参数 hash := c.Param("hash") password := c.Query("password") + if strings.TrimSpace(hash) == "" { - c.String(400, "参数错误") + c.String(http.StatusBadRequest, "参数错误") return } - // 查询数据库 - var shortLink model.ShortLink - result := database.FindShortLinkByHash(hash, &shortLink) - // 重定向 - if result.Error != nil { - c.String(404, "未找到短链接或密码错误") + + // 查询数据库中的短链接 + shortLink, err := database.FindShortLinkByHash(hash) + if err != nil { + c.String(http.StatusNotFound, "未找到短链接或密码错误") return } + + // 校验密码 if shortLink.Password != "" && shortLink.Password != password { - c.String(404, "未找到短链接或密码错误") + c.String(http.StatusNotFound, "未找到短链接或密码错误") return } + // 更新最后访问时间 shortLink.LastRequestTime = time.Now().Unix() - database.SaveShortLink(&shortLink) - get, err := common.Get("http://localhost:" + strconv.Itoa(config.Default.Port) + "/" + shortLink.Url) + err = database.SaveShortLink(shortLink) if err != nil { - logger.Logger.Debug("get short link data failed", zap.Error(err)) - c.String(500, "请求错误: "+err.Error()) + respondWithError(c, http.StatusInternalServerError, "数据库错误") return } - all, err := io.ReadAll(get.Body) + // 请求短链接指向的URL + response, err := http.Get("http://localhost:" + strconv.Itoa(config.Default.Port) + "/" + shortLink.Url) if err != nil { - logger.Logger.Debug("read short link data failed", zap.Error(err)) - c.String(500, "读取错误: "+err.Error()) + respondWithError(c, http.StatusInternalServerError, "请求错误: "+err.Error()) return } + defer response.Body.Close() + + // 读取响应内容 + all, err := io.ReadAll(response.Body) + if err != nil { + respondWithError(c, http.StatusInternalServerError, "读取错误: "+err.Error()) + return + } + + // 返回响应内容 c.String(http.StatusOK, string(all)) } - -func ShortLinkUpdateHandler(c *gin.Context) { - var params validator.ShortLinkUpdateValidator - if err := c.ShouldBind(¶ms); err != nil { - c.String(400, "参数错误: "+err.Error()) - } - if strings.TrimSpace(params.Url) == "" { - c.String(400, "参数错误") - return - } - var shortLink model.ShortLink - result := database.FindShortLinkByHash(params.Hash, &shortLink) - if result.Error != nil { - c.String(404, "未找到短链接") - return - } - if shortLink.Password == "" { - c.String(403, "无法修改无密码短链接") - return - } - if shortLink.Password != params.Password { - c.String(403, "密码错误") - return - } - shortLink.Url = params.Url - database.SaveShortLink(&shortLink) - c.String(200, "更新成功") -} diff --git a/api/route.go b/api/route.go index 856d103..db165c8 100644 --- a/api/route.go +++ b/api/route.go @@ -43,33 +43,9 @@ func SetRoute(r *gin.Engine) { ) }, ) - r.GET( - "/clash", func(c *gin.Context) { - handler.SubmodHandler(c) - }, - ) - r.GET( - "/meta", func(c *gin.Context) { - handler.SubHandler(c) - }, - ) - r.GET( - "/s/:hash", func(c *gin.Context) { - handler.ShortLinkGetConfigHandler(c) - }, - ) - r.GET( - "/short", func(c *gin.Context) { - handler.ShortLinkGetUrlHandler(c) - }) - r.POST( - "/short", func(c *gin.Context) { - handler.ShortLinkGenHandler(c) - }, - ) - r.PUT( - "/short", func(c *gin.Context) { - handler.ShortLinkUpdateHandler(c) - }, - ) + r.GET("/clash", handler.SubmodHandler) + r.GET("/meta", handler.SubHandler) + r.GET("/s/:hash", handler.GetRawConfHandler) + r.POST("/short", handler.GenerateLinkHandler) + r.PUT("/short", handler.UpdateLinkHandler) } diff --git a/common/database/database.go b/common/database/database.go index f5cce25..c714e67 100644 --- a/common/database/database.go +++ b/common/database/database.go @@ -1,56 +1,71 @@ package database import ( + "encoding/json" + "errors" "path/filepath" - "sub2clash/common" - "sub2clash/logger" + "sub2clash/model" - "github.com/glebarez/sqlite" - "go.uber.org/zap" - "gorm.io/gorm" + "go.etcd.io/bbolt" ) -var DB *gorm.DB +var DB *bbolt.DB func ConnectDB() error { - // 用上面的数据库连接初始化 gorm - err := common.MKDir("data") - if err != nil { - return err - } - db, err := gorm.Open( - sqlite.Open(filepath.Join("data", "sub2clash.db")), &gorm.Config{ - Logger: nil, - }, - ) + // 确保数据目录存在 + path := filepath.Join("data", "sub2clash.db") + // 打开或创建数据库文件 + db, err := bbolt.Open(path, 0600, nil) if err != nil { return err } DB = db - err = db.AutoMigrate(&model.ShortLink{}) - if err != nil { + + // 确保存储桶存在 + return db.Update(func(tx *bbolt.Tx) error { + _, err := tx.CreateBucketIfNotExists([]byte("ShortLinks")) return err + }) +} + +func FindShortLinkByHash(hash string) (*model.ShortLink, error) { + var shortLink model.ShortLink + err := DB.View(func(tx *bbolt.Tx) error { + b := tx.Bucket([]byte("ShortLinks")) + v := b.Get([]byte(hash)) + if v == nil { + return errors.New("ShortLink not found") + } + return json.Unmarshal(v, &shortLink) + }) + if err != nil { + return nil, err } - return nil + return &shortLink, nil } -func FindShortLinkByUrl(url string, shortLink *model.ShortLink) *gorm.DB { - logger.Logger.Debug("find short link by url", zap.String("url", url)) - return DB.Where("url = ?", url).First(&shortLink) +func SaveShortLink(shortLink *model.ShortLink) error { + return DB.Update(func(tx *bbolt.Tx) error { + b := tx.Bucket([]byte("ShortLinks")) + encoded, err := json.Marshal(shortLink) + if err != nil { + return err + } + return b.Put([]byte(shortLink.Hash), encoded) + }) } -func FindShortLinkByHash(hash string, shortLink *model.ShortLink) *gorm.DB { - logger.Logger.Debug("find short link by hash", zap.String("hash", hash)) - return DB.Where("hash = ?", hash).First(&shortLink) -} - -func SaveShortLink(shortLink *model.ShortLink) { - logger.Logger.Debug("save short link", zap.String("hash", shortLink.Hash)) - DB.Save(shortLink) -} - -func FirstOrCreateShortLink(shortLink *model.ShortLink) { - logger.Logger.Debug("first or create short link", zap.String("hash", shortLink.Hash)) - DB.FirstOrCreate(shortLink) +func CheckShortLinkHashExists(hash string) (bool, error) { + exists := false + err := DB.View(func(tx *bbolt.Tx) error { + b := tx.Bucket([]byte("ShortLinks")) + v := b.Get([]byte(hash)) + exists = v != nil + return nil + }) + if err != nil { + return false, err + } + return exists, nil } diff --git a/common/mkdir.go b/common/mkdir.go index 584f6b0..f353fb2 100644 --- a/common/mkdir.go +++ b/common/mkdir.go @@ -26,5 +26,8 @@ func MkEssentialDir() error { if err := MKDir("logs"); err != nil { return errors.New("create logs dir failed" + err.Error()) } + if err := MKDir("data"); err != nil { + return errors.New("create data dir failed" + err.Error()) + } return nil } diff --git a/common/sub.go b/common/sub.go index 71febe8..8ab3082 100644 --- a/common/sub.go +++ b/common/sub.go @@ -5,6 +5,7 @@ import ( "encoding/hex" "fmt" "io" + "net/http" "os" "path/filepath" "sub2clash/config" @@ -57,11 +58,11 @@ func FetchSubscriptionFromAPI(url string) ([]byte, error) { if err != nil { return nil, err } - defer func(Body io.ReadCloser) { - if Body != nil { - _ = Body.Close() + defer func(resp *http.Response) { + if resp != nil && resp.Body != nil { + _ = resp.Body.Close() } - }(resp.Body) + }(resp) data, err := io.ReadAll(resp.Body) if err != nil { return nil, fmt.Errorf("failed to read response body: %w", err) diff --git a/go.mod b/go.mod index 9c24550..a174e98 100644 --- a/go.mod +++ b/go.mod @@ -4,40 +4,31 @@ go 1.21 require ( github.com/gin-gonic/gin v1.9.1 - github.com/glebarez/sqlite v1.10.0 github.com/joho/godotenv v1.5.1 + go.etcd.io/bbolt v1.3.9 go.uber.org/zap v1.27.0 golang.org/x/text v0.14.0 gopkg.in/yaml.v3 v3.0.1 - gorm.io/gorm v1.25.7 ) require ( github.com/bytedance/sonic v1.11.3 // indirect github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d // indirect github.com/chenzhuoyu/iasm v0.9.1 // indirect - github.com/dustin/go-humanize v1.0.1 // indirect github.com/gabriel-vasile/mimetype v1.4.3 // indirect github.com/gin-contrib/sse v0.1.0 // indirect - github.com/glebarez/go-sqlite v1.22.0 // indirect github.com/go-playground/locales v0.14.1 // indirect github.com/go-playground/universal-translator v0.18.1 // indirect github.com/go-playground/validator/v10 v10.19.0 // indirect github.com/goccy/go-json v0.10.2 // indirect github.com/google/go-cmp v0.6.0 // indirect - github.com/google/uuid v1.6.0 // indirect - github.com/jinzhu/inflection v1.0.0 // indirect - github.com/jinzhu/now v1.1.5 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/klauspost/cpuid/v2 v2.2.7 // indirect github.com/leodido/go-urn v1.4.0 // indirect github.com/mattn/go-isatty v0.0.20 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect - github.com/natefinch/lumberjack v2.0.0+incompatible // indirect - github.com/ncruces/go-strftime v0.1.9 // indirect github.com/pelletier/go-toml/v2 v2.1.1 // indirect - github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect github.com/twitchyliquid64/golang-asm v0.15.1 // indirect github.com/ugorji/go/codec v1.2.12 // indirect go.uber.org/multierr v1.11.0 // indirect @@ -46,8 +37,4 @@ require ( golang.org/x/net v0.22.0 // indirect golang.org/x/sys v0.18.0 // indirect google.golang.org/protobuf v1.33.0 // indirect - modernc.org/libc v1.44.0 // indirect - modernc.org/mathutil v1.6.0 // indirect - modernc.org/memory v1.7.2 // indirect - modernc.org/sqlite v1.29.4 // indirect ) diff --git a/go.sum b/go.sum index 6a13fbc..98cb763 100644 --- a/go.sum +++ b/go.sum @@ -12,18 +12,12 @@ github.com/chenzhuoyu/iasm v0.9.1/go.mod h1:Xjy2NpN3h7aUqeqM+woSuuvxmIe6+DDsiNLI github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY= -github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto= github.com/gabriel-vasile/mimetype v1.4.3 h1:in2uUcidCuFcDKtdcBxlR0rJ1+fsokWf+uqxgUFjbI0= github.com/gabriel-vasile/mimetype v1.4.3/go.mod h1:d8uq/6HKRL6CGdk+aubisF/M5GcPfT7nKyLpA0lbSSk= github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE= github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI= github.com/gin-gonic/gin v1.9.1 h1:4idEAncQnU5cB7BeOkPtxjfCSye0AAm1R0RVIqJ+Jmg= github.com/gin-gonic/gin v1.9.1/go.mod h1:hPrL7YrpYKXt5YId3A/Tnip5kqbEAP+KLuI3SUcPTeU= -github.com/glebarez/go-sqlite v1.22.0 h1:uAcMJhaA6r3LHMTFgP0SifzgXg46yJkgxqyuyec+ruQ= -github.com/glebarez/go-sqlite v1.22.0/go.mod h1:PlBIdHe0+aUEFn+r2/uthrWq4FxbzugL0L8Li6yQJbc= -github.com/glebarez/sqlite v1.10.0 h1:u4gt8y7OND/cCei/NMHmfbLxF6xP2wgKcT/BJf2pYkc= -github.com/glebarez/sqlite v1.10.0/go.mod h1:IJ+lfSOmiekhQsFTJRx/lHtGYmCdtAiTaf5wI9u5uHA= github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s= github.com/go-playground/assert/v2 v2.2.0/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4= github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/oXslEjJA= @@ -37,14 +31,6 @@ github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MG github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= -github.com/google/pprof v0.0.0-20221118152302-e6195bd50e26 h1:Xim43kblpZXfIBQsbuBVKCudVG457BR2GZFIz3uw3hQ= -github.com/google/pprof v0.0.0-20221118152302-e6195bd50e26/go.mod h1:dDKJzRmX4S37WGHujM7tX//fmj1uioxKzKxz3lo4HJo= -github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= -github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E= -github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc= -github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ= -github.com/jinzhu/now v1.1.5/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8= github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0= github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4= github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= @@ -62,16 +48,10 @@ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= -github.com/natefinch/lumberjack v2.0.0+incompatible h1:4QJd3OLAMgj7ph+yZTuX13Ld4UpgHp07nNdFX7mqFfM= -github.com/natefinch/lumberjack v2.0.0+incompatible/go.mod h1:Wi9p2TTF5DG5oU+6YfsmYQpsTIOm0B1VNzQg9Mw6nPk= -github.com/ncruces/go-strftime v0.1.9 h1:bY0MQC28UADQmHmaF5dgpLmImcShSi2kHU9XLdhx/f4= -github.com/ncruces/go-strftime v0.1.9/go.mod h1:Fwc5htZGVVkseilnfgOVb9mKy6w1naJmn9CehxcKcls= github.com/pelletier/go-toml/v2 v2.1.1 h1:LWAJwfNvjQZCFIDKWYQaM62NcYeYViCmWIwmOStowAI= github.com/pelletier/go-toml/v2 v2.1.1/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec h1:W09IVJc94icq4NjY3clb7Lk8O1qJ8BdBEF8z0ibU0rE= -github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= @@ -86,6 +66,8 @@ github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08= github.com/ugorji/go/codec v1.2.12 h1:9LC83zGrHhuUA9l16C9AHXAqEV/2wBQ4nkvumAE65EE= github.com/ugorji/go/codec v1.2.12/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg= +go.etcd.io/bbolt v1.3.9 h1:8x7aARPEXiXbHmtUwAIv7eV2fQFHrLLavdiJ3uzJXoI= +go.etcd.io/bbolt v1.3.9/go.mod h1:zaO32+Ti0PK1ivdPtgMESzuzL2VPoIG1PCQNvOdo/dE= 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/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= @@ -97,18 +79,16 @@ golang.org/x/arch v0.7.0 h1:pskyeJh/3AmoQ8CPE95vxHLqp1G1GfGNXTmcl9NEKTc= golang.org/x/arch v0.7.0/go.mod h1:FEVrYAQjsQXMVJ1nsMoVVXPZg6p2JE2mx8psSWTDQys= golang.org/x/crypto v0.21.0 h1:X31++rzVUdKhX5sWmSOFZxx8UW/ldWx55cbf08iNAMA= golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs= -golang.org/x/mod v0.16.0 h1:QX4fJ0Rr5cPQCF7O9lh9Se4pmwfwskqZfq5moyldzic= -golang.org/x/mod v0.16.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= golang.org/x/net v0.22.0 h1:9sGLhx7iRIHEiX0oAJ3MRZMUCElJgy7Br1nO+AMN3Tc= golang.org/x/net v0.22.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= +golang.org/x/sync v0.5.0 h1:60k92dhOjHxJkrqnwsfl8KuaHbn/5dl0lUPUklKo3qE= +golang.org/x/sync v0.5.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4= golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= -golang.org/x/tools v0.19.0 h1:tfGCXNR1OsFG+sVdLAitlpjAvD/I6dHDKnYrpEZUHkw= -golang.org/x/tools v0.19.0/go.mod h1:qoJWxmGSIBmAeriMx19ogtrEPrGtDbPK634QFIcLAhc= google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= @@ -116,31 +96,5 @@ gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gorm.io/gorm v1.25.7 h1:VsD6acwRjz2zFxGO50gPO6AkNs7KKnvfzUjHQhZDz/A= -gorm.io/gorm v1.25.7/go.mod h1:hbnx/Oo0ChWMn1BIhpy1oYozzpM15i4YPuHDmfYtwg8= -modernc.org/cc/v4 v4.19.3 h1:vE9kmJqUcyvNOf8F2Hn8od14SOMq34BiqcZ2tMzLk5c= -modernc.org/cc/v4 v4.19.3/go.mod h1:HM7VJTZbUCR3rV8EYBi9wxnJ0ZBRiGE5OeGXNA0IsLQ= -modernc.org/ccgo/v4 v4.10.1 h1:qi+3luLv0LR5UkLmZyKXZxIC4K/136vcAUoYYeGSS+g= -modernc.org/ccgo/v4 v4.10.1/go.mod h1:9YDnb1IIvHymh899K5a++jza0JIWygZPTc5dlh7xvhQ= -modernc.org/fileutil v1.3.0 h1:gQ5SIzK3H9kdfai/5x41oQiKValumqNTDXMvKo62HvE= -modernc.org/fileutil v1.3.0/go.mod h1:XatxS8fZi3pS8/hKG2GH/ArUogfxjpEKs3Ku3aK4JyQ= -modernc.org/gc/v2 v2.4.1 h1:9cNzOqPyMJBvrUipmynX0ZohMhcxPtMccYgGOJdOiBw= -modernc.org/gc/v2 v2.4.1/go.mod h1:wzN5dK1AzVGoH6XOzc3YZ+ey/jPgYHLuVckd62P0GYU= -modernc.org/libc v1.44.0 h1:71bbnKgb0mCg7GOOI/PHlzz7Bv6obELGNKnIEeowX8c= -modernc.org/libc v1.44.0/go.mod h1:RRqfGVjvILF5AdNP3RPCiihj7+Dn2pIBrdlU60lA9vs= -modernc.org/mathutil v1.6.0 h1:fRe9+AmYlaej+64JsEEhoWuAYBkOtQiMEU7n/XgfYi4= -modernc.org/mathutil v1.6.0/go.mod h1:Ui5Q9q1TR2gFm0AQRqQUaBWFLAhQpCwNcuhBOSedWPo= -modernc.org/memory v1.7.2 h1:Klh90S215mmH8c9gO98QxQFsY+W451E8AnzjoE2ee1E= -modernc.org/memory v1.7.2/go.mod h1:NO4NVCQy0N7ln+T9ngWqOQfi7ley4vpwvARR+Hjw95E= -modernc.org/opt v0.1.3 h1:3XOZf2yznlhC+ibLltsDGzABUGVx8J6pnFMS3E4dcq4= -modernc.org/opt v0.1.3/go.mod h1:WdSiB5evDcignE70guQKxYUl14mgWtbClRi5wmkkTX0= -modernc.org/sortutil v1.2.0 h1:jQiD3PfS2REGJNzNCMMaLSp/wdMNieTbKX920Cqdgqc= -modernc.org/sortutil v1.2.0/go.mod h1:TKU2s7kJMf1AE84OoiGppNHJwvB753OYfNl2WRb++Ss= -modernc.org/sqlite v1.29.4 h1:mbvQTJ3Tl5Vz+wLA6z8hdBFSeNQ0XXQ+KVwn8NkUliw= -modernc.org/sqlite v1.29.4/go.mod h1:MjUIBKZ+tU/lqjNLbVAAMjsQPdWdA/ciwdhsT9kBwk8= -modernc.org/strutil v1.2.0 h1:agBi9dp1I+eOnxXeiZawM8F4LawKv4NzGWSaLfyeNZA= -modernc.org/strutil v1.2.0/go.mod h1:/mdcBmfOibveCTBxUl5B5l6W+TTH1FXPLHZE6bTosX0= -modernc.org/token v1.1.0 h1:Xl7Ap9dKaEs5kLoOQeQmPWevfnk/DM5qcLcYlA8ys6Y= -modernc.org/token v1.1.0/go.mod h1:UGzOrNV1mAFSEB63lOFHIpNRUVMvYTc6yu1SMY/XTDM= nullprogram.com/x/optparse v1.0.0/go.mod h1:KdyPE+Igbe0jQUrVfMqDMeJQIJZEuyV7pjYmp6pbG50= rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4= diff --git a/model/short_link.go b/model/short_link.go index f18b11f..23867e4 100644 --- a/model/short_link.go +++ b/model/short_link.go @@ -1,7 +1,7 @@ package model type ShortLink struct { - Hash string `gorm:"primary_key"` + Hash string Url string Password string LastRequestTime int64 diff --git a/validator/short_link.go b/validator/short_link.go index 45eb3d1..88d3969 100644 --- a/validator/short_link.go +++ b/validator/short_link.go @@ -5,7 +5,7 @@ type ShortLinkGenValidator struct { Password string `form:"password"` } -type ShortLinkGetValidator struct { +type GetUrlValidator struct { Hash string `form:"hash" binding:"required"` // Hash: 短链接 Password string `form:"password"` }