yjp 2 dagar sedan
förälder
incheckning
085b7ad779
3 ändrade filer med 9 tillägg och 11 borttagningar
  1. 4 3
      framework/core/mqtt_api/mqtt_api.go
  2. 2 3
      go.mod
  3. 3 5
      go.sum

+ 4 - 3
framework/core/mqtt_api/mqtt_api.go

@@ -1,10 +1,11 @@
 package mqtt_api
 
 import (
-	"git.sxidc.com/service-supports/fslog"
 	"runtime/debug"
 	"slices"
 	"time"
+
+	"git.sxidc.com/go-framework/baize/framework/core/infrastructure/logger"
 )
 
 type MqttApi struct {
@@ -29,7 +30,7 @@ func New(opts ...Option) (*MqttApi, error) {
 			}
 
 			end := time.Now()
-			fslog.Info("| %d | %s |",
+			logger.GetInstance().Info("| %d | %s |",
 				end.Sub(start),
 				c.Topic,
 			)
@@ -38,7 +39,7 @@ func New(opts ...Option) (*MqttApi, error) {
 			defer func() {
 				err := recover()
 				if err != nil {
-					fslog.Error("%s", debug.Stack())
+					logger.GetInstance().Error("%s", debug.Stack())
 				}
 			}()
 

+ 2 - 3
go.mod

@@ -3,15 +3,15 @@ module git.sxidc.com/go-framework/baize
 go 1.22.3
 
 require (
-	git.sxidc.com/go-tools/utils v1.5.29
+	git.sxidc.com/go-tools/utils v1.5.34
 	git.sxidc.com/service-supports/ds-sdk v0.10.12
-	git.sxidc.com/service-supports/fslog v0.5.9
 	github.com/dgrijalva/jwt-go v3.2.0+incompatible
 	github.com/eclipse/paho.mqtt.golang v1.4.3
 	github.com/gin-gonic/gin v1.10.0
 	github.com/go-playground/locales v0.14.1
 	github.com/go-playground/universal-translator v0.18.1
 	github.com/go-playground/validator/v10 v10.20.0
+	github.com/goccy/go-json v0.10.2
 	github.com/iancoleman/strcase v0.3.0
 	github.com/pkg/errors v0.9.1
 	github.com/redis/go-redis/v9 v9.4.0
@@ -40,7 +40,6 @@ require (
 	github.com/git-chglog/git-chglog v0.0.0-20190611050339-63a4e637021f // indirect
 	github.com/go-redis/redis/v7 v7.3.0 // indirect
 	github.com/go-resty/resty/v2 v2.11.0 // indirect
-	github.com/goccy/go-json v0.10.2 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/protobuf v1.5.4 // indirect
 	github.com/google/uuid v1.6.0 // indirect

+ 3 - 5
go.sum

@@ -1,9 +1,7 @@
-git.sxidc.com/go-tools/utils v1.5.29 h1:OUrjzmnjxn+Anmz6FK2X5Pr4ljyrq5qNBaDs1dJLM6g=
-git.sxidc.com/go-tools/utils v1.5.29/go.mod h1:uTDb6QK5JZzK5+Fzsfeng7TwmnRDZiTY6JLYxIX94Qw=
+git.sxidc.com/go-tools/utils v1.5.34 h1:z3E+4WPs1LrQRCD1Zp/mZoqMbn3xCtgE85m4ZLaJkQo=
+git.sxidc.com/go-tools/utils v1.5.34/go.mod h1:uTDb6QK5JZzK5+Fzsfeng7TwmnRDZiTY6JLYxIX94Qw=
 git.sxidc.com/service-supports/ds-sdk v0.10.12 h1:xg8uuSBPMVcPXXx7snPhZithgqxfJSJ8AZB+f1smE1o=
 git.sxidc.com/service-supports/ds-sdk v0.10.12/go.mod h1:QS5FgT3fyPbDl4ak6BO5IF7X4B6Z2uQWpRPskYb/oto=
-git.sxidc.com/service-supports/fslog v0.5.9 h1:q2XIK2o/fk/qmByy4x5kKLC+k7kolT5LrXHcWRSffXQ=
-git.sxidc.com/service-supports/fslog v0.5.9/go.mod h1:/m03ATmmOle75qtEgvEw8a1+Dcg6iHp08M1bGFXJTBU=
 github.com/Masterminds/goutils v1.1.1 h1:5nUrii3FMTL5diU80unEVvNevw1nH4+ZV4DSLVJLSYI=
 github.com/Masterminds/goutils v1.1.1/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy863GQaJW2MFNU=
 github.com/Masterminds/semver/v3 v3.2.0 h1:3MEsd0SM6jqZojhjLWWeBY+Kcjy9i6MQAeY7YgDP83g=
@@ -281,8 +279,8 @@ golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtn
 golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
+golang.org/x/tools v0.6.0 h1:BOw41kyTf3PuCW1pVQf8+Cyg8pMlkYB1oo9iJ6D/lKM=
 golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
-golang.org/x/tools v0.7.0 h1:W4OVu8VVOaIO0yzWMNdepAulS7YfoS3Zabrm8DOXXU4=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=