Merge branch 'dev' into x/tryst-gorotine-pool

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"

go.mod

@@ -5,7 +5,6 @@ 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

go.sum

@@ -123,8 +123,6 @@ 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=

internal/conf/conf.go

@@ -8,7 +8,7 @@ import (
 	"log"
 	"time"
 
-	"github.com/alimy/cfg"
+	"github.com/alimy/tryst/cfg"
 )
 
 var (

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"
 )
 

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"

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"

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"
 )

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"

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"

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"
 )
 

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"

internal/migration/migration.go

@@ -8,7 +8,7 @@
 package migration
 
 import (
-	"github.com/alimy/cfg"
+	"github.com/alimy/tryst/cfg"
 	"github.com/sirupsen/logrus"
 )
 

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"

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"

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"
 )

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"

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"

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"
 )
 

pkg/debug/pyroscope.go

@@ -8,7 +8,7 @@
 package debug
 
 import (
-	"github.com/alimy/cfg"
+	"github.com/alimy/tryst/cfg"
 	"github.com/sirupsen/logrus"
 )
 

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"