[🚀] git -> gitea #2

Merged
bvbej merged 2 commits from dev into main 2024-07-31 16:50:26 +08:00
35 changed files with 71 additions and 71 deletions
Showing only changes of commit 55488a023e - Show all commits

6
go.mod
View File

@ -1,4 +1,4 @@
module git.bvbej.com/bvbej/base-golang module gitea.bvbej.com/bvbej/base-golang
go 1.22.5 go 1.22.5
@ -17,7 +17,7 @@ require (
github.com/panjf2000/ants/v2 v2.10.0 github.com/panjf2000/ants/v2 v2.10.0
github.com/prometheus/client_golang v1.19.1 github.com/prometheus/client_golang v1.19.1
github.com/qiniu/go-sdk/v7 v7.21.1 github.com/qiniu/go-sdk/v7 v7.21.1
github.com/redis/go-redis/v9 v9.6.0 github.com/redis/go-redis/v9 v9.6.1
github.com/robfig/cron/v3 v3.0.1 github.com/robfig/cron/v3 v3.0.1
github.com/rs/cors v1.11.0 github.com/rs/cors v1.11.0
github.com/rs/cors/wrapper/gin v0.0.0-20240515105523-1562b1715b35 github.com/rs/cors/wrapper/gin v0.0.0-20240515105523-1562b1715b35
@ -26,7 +26,7 @@ require (
github.com/spf13/viper v1.19.0 github.com/spf13/viper v1.19.0
github.com/stretchr/testify v1.9.0 github.com/stretchr/testify v1.9.0
github.com/tidwall/buntdb v1.3.1 github.com/tidwall/buntdb v1.3.1
github.com/tidwall/gjson v1.17.1 github.com/tidwall/gjson v1.17.3
github.com/tus/tusd v1.13.0 github.com/tus/tusd v1.13.0
github.com/xuri/excelize/v2 v2.8.1 github.com/xuri/excelize/v2 v2.8.1
go.mongodb.org/mongo-driver v1.16.0 go.mongodb.org/mongo-driver v1.16.0

8
go.sum
View File

@ -1246,8 +1246,8 @@ github.com/qiniu/dyn v1.3.0/go.mod h1:E8oERcm8TtwJiZvkQPbcAh0RL8jO1G0VXJMW3FAWdk
github.com/qiniu/go-sdk/v7 v7.21.1 h1:D/IjVOlg5pTw0jeDjqTo6H5QM73Obb1AYfPOHmIFN+Q= github.com/qiniu/go-sdk/v7 v7.21.1 h1:D/IjVOlg5pTw0jeDjqTo6H5QM73Obb1AYfPOHmIFN+Q=
github.com/qiniu/go-sdk/v7 v7.21.1/go.mod h1:8EM2awITynlem2VML2dXGHkMYP2UyECsGLOdp6yMpco= github.com/qiniu/go-sdk/v7 v7.21.1/go.mod h1:8EM2awITynlem2VML2dXGHkMYP2UyECsGLOdp6yMpco=
github.com/qiniu/x v1.10.5/go.mod h1:03Ni9tj+N2h2aKnAz+6N0Xfl8FwMEDRC2PAlxekASDs= github.com/qiniu/x v1.10.5/go.mod h1:03Ni9tj+N2h2aKnAz+6N0Xfl8FwMEDRC2PAlxekASDs=
github.com/redis/go-redis/v9 v9.6.0 h1:NLck+Rab3AOTHw21CGRpvQpgTrAU4sgdCswqGtlhGRA= github.com/redis/go-redis/v9 v9.6.1 h1:HHDteefn6ZkTtY5fGUE8tj8uy85AHk6zP7CpzIAM0y4=
github.com/redis/go-redis/v9 v9.6.0/go.mod h1:hdY0cQFCN4fnSYT6TkisLufl/4W5UIXyv0b/CLO2V2M= github.com/redis/go-redis/v9 v9.6.1/go.mod h1:0C0c6ycQsdpVNQpxb1njEQIqkx5UcsM8FJCQLgE9+RA=
github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo= github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo= github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
github.com/richardlehane/mscfb v1.0.4 h1:WULscsljNPConisD5hR0+OyZjwK46Pfyr6mPu5ZawpM= github.com/richardlehane/mscfb v1.0.4 h1:WULscsljNPConisD5hR0+OyZjwK46Pfyr6mPu5ZawpM=
@ -1332,8 +1332,8 @@ github.com/tidwall/btree v1.4.2/go.mod h1:LGm8L/DZjPLmeWGjv5kFrY8dL4uVhMmzmmLYms
github.com/tidwall/buntdb v1.3.1 h1:HKoDF01/aBhl9RjYtbaLnvX9/OuenwvQiC3OP1CcL4o= github.com/tidwall/buntdb v1.3.1 h1:HKoDF01/aBhl9RjYtbaLnvX9/OuenwvQiC3OP1CcL4o=
github.com/tidwall/buntdb v1.3.1/go.mod h1:lZZrZUWzlyDJKlLQ6DKAy53LnG7m5kHyrEHvvcDmBpU= github.com/tidwall/buntdb v1.3.1/go.mod h1:lZZrZUWzlyDJKlLQ6DKAy53LnG7m5kHyrEHvvcDmBpU=
github.com/tidwall/gjson v1.12.1/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk= github.com/tidwall/gjson v1.12.1/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
github.com/tidwall/gjson v1.17.1 h1:wlYEnwqAHgzmhNUFfw7Xalt2JzQvsMx2Se4PcoFCT/U= github.com/tidwall/gjson v1.17.3 h1:bwWLZU7icoKRG+C+0PNwIKC6FCJO/Q3p2pZvuP0jN94=
github.com/tidwall/gjson v1.17.1/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk= github.com/tidwall/gjson v1.17.3/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
github.com/tidwall/grect v0.1.4 h1:dA3oIgNgWdSspFzn1kS4S/RDpZFLrIxAZOdJKjYapOg= github.com/tidwall/grect v0.1.4 h1:dA3oIgNgWdSspFzn1kS4S/RDpZFLrIxAZOdJKjYapOg=
github.com/tidwall/grect v0.1.4/go.mod h1:9FBsaYRaR0Tcy4UwefBX/UDcDcDy9V5jUcxHzv2jd5Q= github.com/tidwall/grect v0.1.4/go.mod h1:9FBsaYRaR0Tcy4UwefBX/UDcDcDy9V5jUcxHzv2jd5Q=
github.com/tidwall/lotsa v1.0.2 h1:dNVBH5MErdaQ/xd9s769R31/n2dXavsQ0Yf4TMEHHw8= github.com/tidwall/lotsa v1.0.2 h1:dNVBH5MErdaQ/xd9s769R31/n2dXavsQ0Yf4TMEHHw8=

View File

@ -4,7 +4,7 @@ import (
"archive/zip" "archive/zip"
"bytes" "bytes"
"fmt" "fmt"
"git.bvbej.com/bvbej/base-golang/pkg/android_binary" "gitea.bvbej.com/bvbej/base-golang/pkg/android_binary"
"image" "image"
"io" "io"
"os" "os"

View File

@ -1,6 +1,6 @@
package apk package apk
import "git.bvbej.com/bvbej/base-golang/pkg/android_binary" import "gitea.bvbej.com/bvbej/base-golang/pkg/android_binary"
// Instrumentation is an application instrumentation code. // Instrumentation is an application instrumentation code.
type Instrumentation struct { type Instrumentation struct {

View File

@ -3,7 +3,7 @@ package ants
import ( import (
"errors" "errors"
"fmt" "fmt"
"git.bvbej.com/bvbej/base-golang/pkg/ticker" "gitea.bvbej.com/bvbej/base-golang/pkg/ticker"
"github.com/panjf2000/ants/v2" "github.com/panjf2000/ants/v2"
"go.uber.org/zap" "go.uber.org/zap"
"runtime/debug" "runtime/debug"

View File

@ -3,7 +3,7 @@ package apollo
import ( import (
"fmt" "fmt"
"git.bvbej.com/bvbej/base-golang/pkg/env" "gitea.bvbej.com/bvbej/base-golang/pkg/env"
"github.com/apolloconfig/agollo/v4" "github.com/apolloconfig/agollo/v4"
"github.com/apolloconfig/agollo/v4/component/log" "github.com/apolloconfig/agollo/v4/component/log"
apolloConfig "github.com/apolloconfig/agollo/v4/env/config" apolloConfig "github.com/apolloconfig/agollo/v4/env/config"

4
pkg/cache/redis.go vendored
View File

@ -6,8 +6,8 @@ import (
"fmt" "fmt"
"time" "time"
"git.bvbej.com/bvbej/base-golang/pkg/time_parse" "gitea.bvbej.com/bvbej/base-golang/pkg/time_parse"
"git.bvbej.com/bvbej/base-golang/pkg/trace" "gitea.bvbej.com/bvbej/base-golang/pkg/trace"
"github.com/redis/go-redis/v9" "github.com/redis/go-redis/v9"
) )

View File

@ -2,7 +2,7 @@ package captcha
import ( import (
"fmt" "fmt"
"git.bvbej.com/bvbej/base-golang/pkg/cache" "gitea.bvbej.com/bvbej/base-golang/pkg/cache"
"github.com/mojocn/base64Captcha" "github.com/mojocn/base64Captcha"
"go.uber.org/zap" "go.uber.org/zap"
"strings" "strings"

View File

@ -7,8 +7,8 @@ import (
"os" "os"
"time" "time"
"git.bvbej.com/bvbej/base-golang/pkg/time_parse" "gitea.bvbej.com/bvbej/base-golang/pkg/time_parse"
"git.bvbej.com/bvbej/base-golang/pkg/trace" "gitea.bvbej.com/bvbej/base-golang/pkg/trace"
"gorm.io/driver/mysql" "gorm.io/driver/mysql"
"gorm.io/gorm" "gorm.io/gorm"
"gorm.io/gorm/logger" "gorm.io/gorm/logger"

View File

@ -1,6 +1,6 @@
package database package database
import "git.bvbej.com/bvbej/base-golang/pkg/trace" import "gitea.bvbej.com/bvbej/base-golang/pkg/trace"
type Trace = trace.T type Trace = trace.T

View File

@ -2,11 +2,11 @@ package downloader
import ( import (
"errors" "errors"
"git.bvbej.com/bvbej/base-golang/pkg/downloader/base" "gitea.bvbej.com/bvbej/base-golang/pkg/downloader/base"
"git.bvbej.com/bvbej/base-golang/pkg/downloader/controller" "gitea.bvbej.com/bvbej/base-golang/pkg/downloader/controller"
"git.bvbej.com/bvbej/base-golang/pkg/downloader/fetcher" "gitea.bvbej.com/bvbej/base-golang/pkg/downloader/fetcher"
"git.bvbej.com/bvbej/base-golang/pkg/downloader/protocol/http" "gitea.bvbej.com/bvbej/base-golang/pkg/downloader/protocol/http"
"git.bvbej.com/bvbej/base-golang/pkg/downloader/util" "gitea.bvbej.com/bvbej/base-golang/pkg/downloader/util"
"github.com/google/uuid" "github.com/google/uuid"
"net/url" "net/url"
"strings" "strings"

View File

@ -2,9 +2,9 @@ package downloader
import ( import (
"fmt" "fmt"
"git.bvbej.com/bvbej/base-golang/pkg/downloader/base" "gitea.bvbej.com/bvbej/base-golang/pkg/downloader/base"
"git.bvbej.com/bvbej/base-golang/pkg/downloader/controller" "gitea.bvbej.com/bvbej/base-golang/pkg/downloader/controller"
"git.bvbej.com/bvbej/base-golang/tool" "gitea.bvbej.com/bvbej/base-golang/tool"
"golang.org/x/net/proxy" "golang.org/x/net/proxy"
"net/http" "net/http"
"net/url" "net/url"

View File

@ -10,7 +10,7 @@ import (
httpURL "net/url" httpURL "net/url"
"time" "time"
"git.bvbej.com/bvbej/base-golang/pkg/trace" "gitea.bvbej.com/bvbej/base-golang/pkg/trace"
) )
const ( const (

View File

@ -4,7 +4,7 @@ import (
"sync" "sync"
"time" "time"
"git.bvbej.com/bvbej/base-golang/pkg/trace" "gitea.bvbej.com/bvbej/base-golang/pkg/trace"
"go.uber.org/zap" "go.uber.org/zap"
) )

View File

@ -11,7 +11,7 @@ import (
"net/url" "net/url"
"time" "time"
"git.bvbej.com/bvbej/base-golang/pkg/trace" "gitea.bvbej.com/bvbej/base-golang/pkg/trace"
"go.uber.org/zap" "go.uber.org/zap"
) )

View File

@ -1,7 +1,7 @@
package limiter package limiter
import ( import (
"git.bvbej.com/bvbej/base-golang/pkg/ticker" "gitea.bvbej.com/bvbej/base-golang/pkg/ticker"
"golang.org/x/time/rate" "golang.org/x/time/rate"
"sync" "sync"
"time" "time"

View File

@ -9,8 +9,8 @@ import (
"strings" "strings"
"sync" "sync"
"git.bvbej.com/bvbej/base-golang/pkg/errno" "gitea.bvbej.com/bvbej/base-golang/pkg/errno"
"git.bvbej.com/bvbej/base-golang/pkg/trace" "gitea.bvbej.com/bvbej/base-golang/pkg/trace"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"github.com/gin-gonic/gin/binding" "github.com/gin-gonic/gin/binding"

View File

@ -8,12 +8,12 @@ import (
"runtime/debug" "runtime/debug"
"time" "time"
"git.bvbej.com/bvbej/base-golang/pkg/color" "gitea.bvbej.com/bvbej/base-golang/pkg/color"
"git.bvbej.com/bvbej/base-golang/pkg/env" "gitea.bvbej.com/bvbej/base-golang/pkg/env"
"git.bvbej.com/bvbej/base-golang/pkg/errno" "gitea.bvbej.com/bvbej/base-golang/pkg/errno"
"git.bvbej.com/bvbej/base-golang/pkg/limiter" "gitea.bvbej.com/bvbej/base-golang/pkg/limiter"
"git.bvbej.com/bvbej/base-golang/pkg/trace" "gitea.bvbej.com/bvbej/base-golang/pkg/trace"
"git.bvbej.com/bvbej/base-golang/pkg/validator" "gitea.bvbej.com/bvbej/base-golang/pkg/validator"
"github.com/gin-contrib/pprof" "github.com/gin-contrib/pprof"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"github.com/gin-gonic/gin/binding" "github.com/gin-gonic/gin/binding"

View File

@ -4,7 +4,7 @@ import (
"fmt" "fmt"
"time" "time"
"git.bvbej.com/bvbej/base-golang/pkg/trace" "gitea.bvbej.com/bvbej/base-golang/pkg/trace"
) )
type Option func(*option) type Option func(*option)

View File

@ -4,8 +4,8 @@ import (
"context" "context"
"errors" "errors"
"fmt" "fmt"
"git.bvbej.com/bvbej/base-golang/pkg/md5" "gitea.bvbej.com/bvbej/base-golang/pkg/md5"
"git.bvbej.com/bvbej/base-golang/tool" "gitea.bvbej.com/bvbej/base-golang/tool"
"github.com/qiniu/go-sdk/v7/auth/qbox" "github.com/qiniu/go-sdk/v7/auth/qbox"
"github.com/qiniu/go-sdk/v7/storage" "github.com/qiniu/go-sdk/v7/storage"
"github.com/tidwall/gjson" "github.com/tidwall/gjson"

View File

@ -10,7 +10,7 @@ import (
"net/url" "net/url"
"strings" "strings"
"git.bvbej.com/bvbej/base-golang/pkg/time_parse" "gitea.bvbej.com/bvbej/base-golang/pkg/time_parse"
) )
// Generate // Generate

View File

@ -11,7 +11,7 @@ import (
"strings" "strings"
"time" "time"
"git.bvbej.com/bvbej/base-golang/pkg/time_parse" "gitea.bvbej.com/bvbej/base-golang/pkg/time_parse"
) )
func (s *signature) Verify(authorization, date string, path string, method string, params url.Values) (ok bool, err error) { func (s *signature) Verify(authorization, date string, path string, method string, params url.Values) (ok bool, err error) {

View File

@ -5,9 +5,9 @@ import (
"crypto/sha256" "crypto/sha256"
"errors" "errors"
"fmt" "fmt"
"git.bvbej.com/bvbej/base-golang/pkg/color" "gitea.bvbej.com/bvbej/base-golang/pkg/color"
"git.bvbej.com/bvbej/base-golang/pkg/ticker" "gitea.bvbej.com/bvbej/base-golang/pkg/ticker"
"git.bvbej.com/bvbej/base-golang/pkg/token" "gitea.bvbej.com/bvbej/base-golang/pkg/token"
"github.com/rs/cors" "github.com/rs/cors"
"github.com/tus/tusd/pkg/filestore" "github.com/tus/tusd/pkg/filestore"
tus "github.com/tus/tusd/pkg/handler" tus "github.com/tus/tusd/pkg/handler"

View File

@ -3,12 +3,12 @@ package client
import ( import (
"errors" "errors"
"fmt" "fmt"
"git.bvbej.com/bvbej/base-golang/pkg/ticker" "gitea.bvbej.com/bvbej/base-golang/pkg/ticker"
"git.bvbej.com/bvbej/base-golang/pkg/websocket/client/service" "gitea.bvbej.com/bvbej/base-golang/pkg/websocket/client/service"
"git.bvbej.com/bvbej/base-golang/pkg/websocket/codec" "gitea.bvbej.com/bvbej/base-golang/pkg/websocket/codec"
_ "git.bvbej.com/bvbej/base-golang/pkg/websocket/codec/json" _ "gitea.bvbej.com/bvbej/base-golang/pkg/websocket/codec/json"
_ "git.bvbej.com/bvbej/base-golang/pkg/websocket/codec/protobuf" _ "gitea.bvbej.com/bvbej/base-golang/pkg/websocket/codec/protobuf"
"git.bvbej.com/bvbej/base-golang/tool" "gitea.bvbej.com/bvbej/base-golang/tool"
"github.com/gorilla/websocket" "github.com/gorilla/websocket"
"go.uber.org/zap" "go.uber.org/zap"
"net/http" "net/http"

View File

@ -2,8 +2,8 @@ package service
import ( import (
"fmt" "fmt"
"git.bvbej.com/bvbej/base-golang/pkg/websocket/codec" "gitea.bvbej.com/bvbej/base-golang/pkg/websocket/codec"
"git.bvbej.com/bvbej/base-golang/pkg/websocket/util" "gitea.bvbej.com/bvbej/base-golang/pkg/websocket/util"
"reflect" "reflect"
"strings" "strings"
) )

View File

@ -5,7 +5,7 @@ import (
"encoding/json" "encoding/json"
"errors" "errors"
"fmt" "fmt"
"git.bvbej.com/bvbej/base-golang/pkg/websocket/codec" "gitea.bvbej.com/bvbej/base-golang/pkg/websocket/codec"
) )
type jsonCodec struct{} type jsonCodec struct{}

View File

@ -4,8 +4,8 @@ import (
"errors" "errors"
"fmt" "fmt"
"git.bvbej.com/bvbej/base-golang/pkg/websocket/codec" "gitea.bvbej.com/bvbej/base-golang/pkg/websocket/codec"
"git.bvbej.com/bvbej/base-golang/pkg/websocket/codec/protobuf/protocol" "gitea.bvbej.com/bvbej/base-golang/pkg/websocket/codec/protobuf/protocol"
"google.golang.org/protobuf/proto" "google.golang.org/protobuf/proto"
) )

View File

@ -4,14 +4,14 @@ import (
"context" "context"
"errors" "errors"
"fmt" "fmt"
"git.bvbej.com/bvbej/base-golang/pkg/mux" "gitea.bvbej.com/bvbej/base-golang/pkg/mux"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"go.uber.org/zap" "go.uber.org/zap"
"net/http" "net/http"
"net/url" "net/url"
"time" "time"
"git.bvbej.com/bvbej/base-golang/pkg/websocket/peer" "gitea.bvbej.com/bvbej/base-golang/pkg/websocket/peer"
"github.com/gorilla/websocket" "github.com/gorilla/websocket"
) )

View File

@ -4,7 +4,7 @@ import (
"errors" "errors"
"time" "time"
"git.bvbej.com/bvbej/base-golang/pkg/websocket/peer" "gitea.bvbej.com/bvbej/base-golang/pkg/websocket/peer"
"github.com/gorilla/websocket" "github.com/gorilla/websocket"
) )

View File

@ -3,7 +3,7 @@ package service
import ( import (
"time" "time"
"git.bvbej.com/bvbej/base-golang/pkg/websocket/peer" "gitea.bvbej.com/bvbej/base-golang/pkg/websocket/peer"
) )
type Component interface { type Component interface {

View File

@ -1,7 +1,7 @@
package service package service
import ( import (
"git.bvbej.com/bvbej/base-golang/pkg/websocket/peer" "gitea.bvbej.com/bvbej/base-golang/pkg/websocket/peer"
"reflect" "reflect"
) )

View File

@ -2,11 +2,11 @@ package service
import ( import (
"errors" "errors"
"git.bvbej.com/bvbej/base-golang/pkg/websocket/util" "gitea.bvbej.com/bvbej/base-golang/pkg/websocket/util"
"reflect" "reflect"
"strings" "strings"
"git.bvbej.com/bvbej/base-golang/pkg/websocket/peer" "gitea.bvbej.com/bvbej/base-golang/pkg/websocket/peer"
) )
type Handler struct { type Handler struct {

View File

@ -2,9 +2,9 @@ package service
import ( import (
"fmt" "fmt"
"git.bvbej.com/bvbej/base-golang/pkg/websocket/codec" "gitea.bvbej.com/bvbej/base-golang/pkg/websocket/codec"
_ "git.bvbej.com/bvbej/base-golang/pkg/websocket/codec/json" _ "gitea.bvbej.com/bvbej/base-golang/pkg/websocket/codec/json"
"git.bvbej.com/bvbej/base-golang/pkg/websocket/peer" "gitea.bvbej.com/bvbej/base-golang/pkg/websocket/peer"
"go.uber.org/zap" "go.uber.org/zap"
) )

View File

@ -6,7 +6,7 @@ import (
"strings" "strings"
"time" "time"
"git.bvbej.com/bvbej/base-golang/pkg/websocket/peer" "gitea.bvbej.com/bvbej/base-golang/pkg/websocket/peer"
) )
type callBackEntity struct{} type callBackEntity struct{}

View File

@ -2,10 +2,10 @@ package tool
import ( import (
"encoding/json" "encoding/json"
"git.bvbej.com/bvbej/base-golang/pkg/aes" "gitea.bvbej.com/bvbej/base-golang/pkg/aes"
"git.bvbej.com/bvbej/base-golang/pkg/hmac" "gitea.bvbej.com/bvbej/base-golang/pkg/hmac"
"git.bvbej.com/bvbej/base-golang/pkg/httpclient" "gitea.bvbej.com/bvbej/base-golang/pkg/httpclient"
"git.bvbej.com/bvbej/base-golang/pkg/time_parse" "gitea.bvbej.com/bvbej/base-golang/pkg/time_parse"
"github.com/tidwall/gjson" "github.com/tidwall/gjson"
netUrl "net/url" netUrl "net/url"
"strconv" "strconv"