Skip to content

Commit

Permalink
chore: upgrade connect
Browse files Browse the repository at this point in the history
whatwewant committed Oct 14, 2023
1 parent b1231f7 commit 9dd0d01
Showing 5 changed files with 16 additions and 167 deletions.
55 changes: 3 additions & 52 deletions go.mod
Original file line number Diff line number Diff line change
@@ -19,7 +19,9 @@ require (
github.com/gin-contrib/cors v1.4.0
github.com/gin-gonic/gin v1.9.1
github.com/go-resty/resty/v2 v2.9.1
github.com/go-zoox/connect v1.10.5
github.com/go-zoox/connect v1.12.0
github.com/go-zoox/connect-middleware-for-gin v0.0.2
github.com/go-zoox/random v1.0.4
github.com/goccy/go-json v0.10.2
github.com/gofrs/uuid/v5 v5.0.0
github.com/golang-jwt/jwt/v5 v5.0.0
@@ -56,8 +58,6 @@ require (
)

require (
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
github.com/Microsoft/go-winio v0.6.1 // indirect
github.com/andybalholm/brotli v1.0.5 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/bits-and-blooms/bitset v1.2.0 // indirect
@@ -67,58 +67,19 @@ require (
github.com/clbanning/mxj v1.8.4 // indirect
github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b // indirect
github.com/cockroachdb/redact v1.1.5 // indirect
github.com/creack/pty v1.1.18 // indirect
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
github.com/distribution/reference v0.5.0 // indirect
github.com/docker/cli v24.0.6+incompatible // indirect
github.com/docker/distribution v2.8.3+incompatible // indirect
github.com/docker/docker v24.0.6+incompatible // indirect
github.com/docker/go-connections v0.4.0 // indirect
github.com/docker/go-units v0.5.0 // indirect
github.com/dustin/go-humanize v1.0.1 // indirect
github.com/fsnotify/fsnotify v1.6.0 // indirect
github.com/gabriel-vasile/mimetype v1.4.2 // indirect
github.com/gin-contrib/sse v0.1.0 // indirect
github.com/go-errors/errors v1.5.1 // indirect
github.com/go-logr/logr v1.2.4 // 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.15.5 // indirect
github.com/go-redis/redis/v8 v8.11.5 // indirect
github.com/go-sql-driver/mysql v1.7.0 // indirect
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
github.com/go-zoox/cache v1.0.6 // indirect
github.com/go-zoox/chalk v1.0.2 // indirect
github.com/go-zoox/command v1.2.8 // indirect
github.com/go-zoox/commands-as-a-service v1.6.2 // indirect
github.com/go-zoox/compress v1.0.1 // indirect
github.com/go-zoox/concurrency v1.2.0 // indirect
github.com/go-zoox/cookie v1.2.0 // indirect
github.com/go-zoox/core-utils v1.2.14 // indirect
github.com/go-zoox/cron v1.1.2 // indirect
github.com/go-zoox/crypto v1.1.8 // indirect
github.com/go-zoox/datetime v1.2.2 // indirect
github.com/go-zoox/debug v1.0.2 // indirect
github.com/go-zoox/encoding v1.2.1 // indirect
github.com/go-zoox/errors v1.0.2 // indirect
github.com/go-zoox/fetch v1.7.16 // indirect
github.com/go-zoox/fs v1.3.13 // indirect
github.com/go-zoox/headers v1.0.8 // indirect
github.com/go-zoox/i18n v1.0.3 // indirect
github.com/go-zoox/jobqueue v1.0.0 // indirect
github.com/go-zoox/jsonrpc v1.2.2 // indirect
github.com/go-zoox/jwt v1.3.0 // indirect
github.com/go-zoox/kv v1.5.9 // indirect
github.com/go-zoox/logger v1.4.6 // indirect
github.com/go-zoox/proxy v1.5.6 // indirect
github.com/go-zoox/pubsub v1.2.2 // indirect
github.com/go-zoox/random v1.0.4 // indirect
github.com/go-zoox/safe v1.0.1 // indirect
github.com/go-zoox/session v1.2.0 // indirect
github.com/go-zoox/tag v1.2.3 // indirect
github.com/go-zoox/uuid v0.0.1 // indirect
github.com/go-zoox/zoox v1.12.22 // indirect
github.com/goccy/go-yaml v1.11.0 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang-jwt/jwt/v4 v4.5.0 // indirect
github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 // indirect
@@ -127,7 +88,6 @@ require (
github.com/google/go-querystring v1.1.0 // indirect
github.com/google/pprof v0.0.0-20230207041349-798e818bf904 // indirect
github.com/google/uuid v1.3.1 // indirect
github.com/gorilla/websocket v1.5.0 // indirect
github.com/hashicorp/errwrap v1.1.0 // indirect
github.com/hashicorp/go-multierror v1.1.1 // indirect
github.com/hashicorp/golang-lru/v2 v2.0.6 // indirect
@@ -155,21 +115,16 @@ require (
github.com/minio/md5-simd v1.1.2 // indirect
github.com/minio/sha256-simd v1.0.1 // indirect
github.com/mitchellh/mapstructure v1.5.0 // indirect
github.com/moby/term v0.5.0 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/morikuni/aec v1.0.0 // indirect
github.com/mozillazg/go-httpheader v0.2.1 // indirect
github.com/mschoch/smat v0.2.0 // indirect
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/opencontainers/image-spec v1.0.2 // indirect
github.com/pelletier/go-toml/v2 v2.1.0 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/prometheus/client_model v0.3.0 // indirect
github.com/prometheus/common v0.42.0 // indirect
github.com/prometheus/procfs v0.10.1 // indirect
github.com/pyroscope-io/godeltaprof v0.1.2 // indirect
github.com/redis/go-redis/v9 v9.1.0 // indirect
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
github.com/rogpeppe/go-internal v1.9.0 // indirect
github.com/rs/xid v1.5.0 // indirect
@@ -181,9 +136,6 @@ require (
github.com/spf13/jwalterweatherman v1.1.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/subosito/gotenv v1.4.2 // indirect
github.com/tidwall/gjson v1.16.0 // indirect
github.com/tidwall/match v1.1.1 // indirect
github.com/tidwall/pretty v1.2.1 // indirect
github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
github.com/ugorji/go/codec v1.2.11 // indirect
github.com/valyala/bytebufferpool v1.0.0 // indirect
@@ -198,7 +150,6 @@ require (
golang.org/x/text v0.13.0 // indirect
golang.org/x/time v0.3.0 // indirect
golang.org/x/tools v0.14.0 // indirect
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
101 changes: 4 additions & 97 deletions go.sum

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions internal/core/user.go
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@
package core

import (
connectMidleware "github.com/go-zoox/connect/pkg/middleware"
connect "github.com/go-zoox/connect/user"
"github.com/rocboss/paopao-ce/internal/core/cs"
"github.com/rocboss/paopao-ce/internal/core/ms"
)
@@ -22,7 +22,7 @@ type UserManageService interface {
UpdateUser(user *ms.User) error
GetRegisterUserCount() (int64, error)
//
GetOrCreateUserByEmail(email string, connectUser *connectMidleware.User) (*ms.User, error)
GetOrCreateUserByEmail(email string, connectUser *connect.User) (*ms.User, error)
}

// ContactManageService 联系人管理服务
4 changes: 2 additions & 2 deletions internal/dao/jinzhu/user.go
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@ import (
"strings"
"sync"

connectMidleware "github.com/go-zoox/connect/pkg/middleware"
connect "github.com/go-zoox/connect/user"
"github.com/go-zoox/random"
"github.com/rocboss/paopao-ce/internal/core"
"github.com/rocboss/paopao-ce/internal/core/cs"
@@ -80,7 +80,7 @@ func (s *userManageSrv) GetUserByUsername(username string) (*ms.User, error) {

var GetOrCreateUserByEmailSync = &sync.Mutex{}

func (s *userManageSrv) GetOrCreateUserByEmail(email string, connectUser *connectMidleware.User) (*ms.User, error) {
func (s *userManageSrv) GetOrCreateUserByEmail(email string, connectUser *connect.User) (*ms.User, error) {
GetOrCreateUserByEmailSync.Lock()
defer GetOrCreateUserByEmailSync.Unlock()

19 changes: 5 additions & 14 deletions internal/service/web.go
Original file line number Diff line number Diff line change
@@ -14,7 +14,7 @@ import (
sentrygin "github.com/getsentry/sentry-go/gin"
"github.com/gin-contrib/cors"
"github.com/gin-gonic/gin"
connectMidleware "github.com/go-zoox/connect/pkg/middleware"
"github.com/go-zoox/connect-middleware-for-gin"
"github.com/rocboss/paopao-ce/internal/conf"
"github.com/rocboss/paopao-ce/internal/servants"
"github.com/rocboss/paopao-ce/internal/servants/base"
@@ -52,21 +52,12 @@ func newWebEngine() *gin.Engine {
e.Use(gin.Logger())
e.Use(gin.Recovery())

e.Use(connectMidleware.CreateGinMiddleware(os.Getenv("SECRET_KEY")))
e.Use(connect.Create(os.Getenv("SECRET_KEY")))
e.Use(func(ctx *gin.Context) {
u, ok := ctx.Get(connectMidleware.ContextUserKeyForGin)
if !ok {
ctx.JSON(http.StatusUnauthorized, gin.H{
"message": "unauthorized (1)",
})
ctx.Abort()
return
}

connectUser, ok := u.(*connectMidleware.User)
if !ok {
connectUser, err := connect.GetUser(ctx)
if err != nil {
ctx.JSON(http.StatusUnauthorized, gin.H{
"message": "unauthorized (2)",
"message": fmt.Sprintf("unauthorized (%s)", err),
})
ctx.Abort()
return

0 comments on commit 9dd0d01

Please sign in to comment.