From 866bd13ff40339400adf5ec2cc1ccc51f93ac8bf Mon Sep 17 00:00:00 2001 From: Michael Li Date: Sat, 26 Aug 2023 14:10:25 +0800 Subject: [PATCH] use github.com/alimy/tryst/cfg instead github.com/alimy/cfg --- cmd/serve/serve.go | 2 +- go.mod | 2 +- go.sum | 4 ++-- internal/conf/conf.go | 2 +- internal/conf/db.go | 2 +- internal/conf/db_gorm.go | 2 +- internal/conf/logger.go | 2 +- internal/conf/sentry.go | 2 +- internal/dao/dao.go | 2 +- internal/dao/jinzhu/jinzhu.go | 2 +- internal/dao/security/security.go | 2 +- internal/dao/storage/storage.go | 2 +- internal/migration/migration.go | 2 +- internal/migration/migration_embed.go | 2 +- internal/servants/chain/priv.go | 2 +- internal/servants/docs/docs_embed.go | 2 +- internal/servants/servants.go | 2 +- internal/servants/web/web.go | 2 +- internal/service/service.go | 2 +- pkg/debug/pyroscope.go | 2 +- pkg/debug/pyroscope_embed.go | 2 +- 21 files changed, 22 insertions(+), 22 deletions(-) diff --git a/cmd/serve/serve.go b/cmd/serve/serve.go index 5ffd7070..b7dcbff1 100644 --- a/cmd/serve/serve.go +++ b/cmd/serve/serve.go @@ -12,7 +12,7 @@ import ( "syscall" "time" - "github.com/alimy/cfg" + "github.com/alimy/tryst/cfg" "github.com/fatih/color" "github.com/getsentry/sentry-go" "github.com/rocboss/paopao-ce/cmd" diff --git a/go.mod b/go.mod index 8b9f0783..7c086f8e 100644 --- a/go.mod +++ b/go.mod @@ -5,8 +5,8 @@ go 1.20 require ( github.com/Masterminds/semver/v3 v3.2.1 github.com/afocus/captcha v0.0.0-20191010092841-4bd1f21c8868 - github.com/alimy/cfg v0.4.0 github.com/alimy/mir/v4 v4.0.0 + github.com/alimy/tryst v0.3.0 github.com/aliyun/aliyun-oss-go-sdk v2.2.8+incompatible github.com/allegro/bigcache/v3 v3.1.0 github.com/bufbuild/connect-go v1.10.0 diff --git a/go.sum b/go.sum index 8252693e..b33e4ccc 100644 --- a/go.sum +++ b/go.sum @@ -123,10 +123,10 @@ github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRF github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho= github.com/alexflint/go-filemutex v0.0.0-20171022225611-72bdc8eae2ae/go.mod h1:CgnQgUtFrFz9mxFNtED3jI5tLDjKlOM+oUF/sTk6ps0= github.com/alexflint/go-filemutex v1.1.0/go.mod h1:7P4iRhttt/nUvUOrYIhcpMzv2G6CY9UnI16Z+UJqRyk= -github.com/alimy/cfg v0.4.0 h1:SslKPndmxRViT1ePWLmNsEq7okYP0GVeuowQlRWZPkw= -github.com/alimy/cfg v0.4.0/go.mod h1:rOxbasTH2srl6StAjNF5Vyi8bfrdkl3fLGmOYtSw81c= github.com/alimy/mir/v4 v4.0.0 h1:MzGfmoLjjvR69jbZEmpKJO3tUuqB0RGRv1UWPbtukBg= github.com/alimy/mir/v4 v4.0.0/go.mod h1:d58dBvw2KImcVbAUANrciEV/of0arMNsI9c/5UNCMMc= +github.com/alimy/tryst v0.3.0 h1:8oeKy8iQQnO6BCs0YGJBnVyVxi6Y3w18n5Xz/uefUtk= +github.com/alimy/tryst v0.3.0/go.mod h1:K//dPeoE/nnv2Jw8C3iPE7n8mO6LVqAxVmqbopM9nAk= github.com/aliyun/aliyun-oss-go-sdk v2.2.8+incompatible h1:6JF1bjhT0WN2srEmijfOFtVWwV91KZ6dJY1/JbdtGrI= github.com/aliyun/aliyun-oss-go-sdk v2.2.8+incompatible/go.mod h1:T/Aws4fEfogEE9v+HPhhw+CntffsBHJ8nXQCwKr0/g8= github.com/allegro/bigcache/v3 v3.1.0 h1:H2Vp8VOvxcrB91o86fUSVJFqeuz8kpyyB02eH3bSzwk= diff --git a/internal/conf/conf.go b/internal/conf/conf.go index 645189d4..213d4f9f 100644 --- a/internal/conf/conf.go +++ b/internal/conf/conf.go @@ -8,7 +8,7 @@ import ( "log" "time" - "github.com/alimy/cfg" + "github.com/alimy/tryst/cfg" ) var ( diff --git a/internal/conf/db.go b/internal/conf/db.go index 32867a9c..092d3cbf 100644 --- a/internal/conf/db.go +++ b/internal/conf/db.go @@ -8,7 +8,7 @@ import ( "database/sql" "sync" - "github.com/alimy/cfg" + "github.com/alimy/tryst/cfg" "github.com/sirupsen/logrus" ) diff --git a/internal/conf/db_gorm.go b/internal/conf/db_gorm.go index f667ff61..eeff6236 100644 --- a/internal/conf/db_gorm.go +++ b/internal/conf/db_gorm.go @@ -8,7 +8,7 @@ import ( "sync" "time" - "github.com/alimy/cfg" + "github.com/alimy/tryst/cfg" "github.com/sirupsen/logrus" "gorm.io/driver/mysql" "gorm.io/driver/postgres" diff --git a/internal/conf/logger.go b/internal/conf/logger.go index dac2e580..3e999bf3 100644 --- a/internal/conf/logger.go +++ b/internal/conf/logger.go @@ -8,7 +8,7 @@ import ( "io" "time" - "github.com/alimy/cfg" + "github.com/alimy/tryst/cfg" "github.com/getsentry/sentry-go" sentrylogrus "github.com/getsentry/sentry-go/logrus" "github.com/sirupsen/logrus" diff --git a/internal/conf/sentry.go b/internal/conf/sentry.go index 70c534e4..0cd64d76 100644 --- a/internal/conf/sentry.go +++ b/internal/conf/sentry.go @@ -7,7 +7,7 @@ package conf import ( "time" - "github.com/alimy/cfg" + "github.com/alimy/tryst/cfg" "github.com/getsentry/sentry-go" "github.com/rocboss/paopao-ce/pkg/version" ) diff --git a/internal/dao/dao.go b/internal/dao/dao.go index b1f7d9f2..8b355e36 100644 --- a/internal/dao/dao.go +++ b/internal/dao/dao.go @@ -7,7 +7,7 @@ package dao import ( "sync" - "github.com/alimy/cfg" + "github.com/alimy/tryst/cfg" "github.com/rocboss/paopao-ce/internal/core" "github.com/rocboss/paopao-ce/internal/dao/jinzhu" "github.com/rocboss/paopao-ce/internal/dao/sakila" diff --git a/internal/dao/jinzhu/jinzhu.go b/internal/dao/jinzhu/jinzhu.go index a3255010..5d4f8333 100644 --- a/internal/dao/jinzhu/jinzhu.go +++ b/internal/dao/jinzhu/jinzhu.go @@ -12,7 +12,7 @@ import ( "sync" "github.com/Masterminds/semver/v3" - "github.com/alimy/cfg" + "github.com/alimy/tryst/cfg" "github.com/rocboss/paopao-ce/internal/conf" "github.com/rocboss/paopao-ce/internal/core" "github.com/rocboss/paopao-ce/internal/dao/cache" diff --git a/internal/dao/security/security.go b/internal/dao/security/security.go index 75cd003b..1556ad73 100644 --- a/internal/dao/security/security.go +++ b/internal/dao/security/security.go @@ -3,7 +3,7 @@ package security import ( "strings" - "github.com/alimy/cfg" + "github.com/alimy/tryst/cfg" "github.com/rocboss/paopao-ce/internal/core" ) diff --git a/internal/dao/storage/storage.go b/internal/dao/storage/storage.go index 0f03fa20..c7b57947 100644 --- a/internal/dao/storage/storage.go +++ b/internal/dao/storage/storage.go @@ -12,7 +12,7 @@ import ( "strconv" "time" - "github.com/alimy/cfg" + "github.com/alimy/tryst/cfg" "github.com/aliyun/aliyun-oss-go-sdk/oss" "github.com/huaweicloud/huaweicloud-sdk-go-obs/obs" "github.com/minio/minio-go/v7" diff --git a/internal/migration/migration.go b/internal/migration/migration.go index 1cac6012..5f3c667d 100644 --- a/internal/migration/migration.go +++ b/internal/migration/migration.go @@ -8,7 +8,7 @@ package migration import ( - "github.com/alimy/cfg" + "github.com/alimy/tryst/cfg" "github.com/sirupsen/logrus" ) diff --git a/internal/migration/migration_embed.go b/internal/migration/migration_embed.go index c2232d29..da3fbab9 100644 --- a/internal/migration/migration_embed.go +++ b/internal/migration/migration_embed.go @@ -10,7 +10,7 @@ package migration import ( "database/sql" - "github.com/alimy/cfg" + "github.com/alimy/tryst/cfg" "github.com/golang-migrate/migrate/v4" "github.com/golang-migrate/migrate/v4/database" "github.com/golang-migrate/migrate/v4/database/mysql" diff --git a/internal/servants/chain/priv.go b/internal/servants/chain/priv.go index 420c3a9c..f3e43904 100644 --- a/internal/servants/chain/priv.go +++ b/internal/servants/chain/priv.go @@ -5,7 +5,7 @@ package chain import ( - "github.com/alimy/cfg" + "github.com/alimy/tryst/cfg" "github.com/gin-gonic/gin" "github.com/rocboss/paopao-ce/internal/core/ms" "github.com/rocboss/paopao-ce/pkg/app" diff --git a/internal/servants/docs/docs_embed.go b/internal/servants/docs/docs_embed.go index 8879896c..b7c76e86 100644 --- a/internal/servants/docs/docs_embed.go +++ b/internal/servants/docs/docs_embed.go @@ -8,7 +8,7 @@ package docs import ( - "github.com/alimy/cfg" + "github.com/alimy/tryst/cfg" "github.com/gin-gonic/gin" "github.com/rocboss/paopao-ce/docs/openapi" ) diff --git a/internal/servants/servants.go b/internal/servants/servants.go index 35af4bdc..39d26d42 100644 --- a/internal/servants/servants.go +++ b/internal/servants/servants.go @@ -7,7 +7,7 @@ package servants import ( "net/http" - "github.com/alimy/cfg" + "github.com/alimy/tryst/cfg" "github.com/bufbuild/connect-go" "github.com/gin-gonic/gin" "github.com/rocboss/paopao-ce/internal/servants/admin" diff --git a/internal/servants/web/web.go b/internal/servants/web/web.go index e58a426b..408b3b08 100644 --- a/internal/servants/web/web.go +++ b/internal/servants/web/web.go @@ -7,7 +7,7 @@ package web import ( "sync" - "github.com/alimy/cfg" + "github.com/alimy/tryst/cfg" "github.com/gin-gonic/gin" api "github.com/rocboss/paopao-ce/auto/api/v1" "github.com/rocboss/paopao-ce/internal/conf" diff --git a/internal/service/service.go b/internal/service/service.go index ad248695..28bf9766 100644 --- a/internal/service/service.go +++ b/internal/service/service.go @@ -8,7 +8,7 @@ import ( "log" "github.com/Masterminds/semver/v3" - "github.com/alimy/cfg" + "github.com/alimy/tryst/cfg" "github.com/rocboss/paopao-ce/pkg/types" ) diff --git a/pkg/debug/pyroscope.go b/pkg/debug/pyroscope.go index 60a8ed74..f34acfb5 100644 --- a/pkg/debug/pyroscope.go +++ b/pkg/debug/pyroscope.go @@ -8,7 +8,7 @@ package debug import ( - "github.com/alimy/cfg" + "github.com/alimy/tryst/cfg" "github.com/sirupsen/logrus" ) diff --git a/pkg/debug/pyroscope_embed.go b/pkg/debug/pyroscope_embed.go index 80a9e149..73db8870 100644 --- a/pkg/debug/pyroscope_embed.go +++ b/pkg/debug/pyroscope_embed.go @@ -10,7 +10,7 @@ package debug import ( "os" - "github.com/alimy/cfg" + "github.com/alimy/tryst/cfg" "github.com/pyroscope-io/client/pyroscope" "github.com/rocboss/paopao-ce/internal/conf" "github.com/sirupsen/logrus"