diff --git a/define.go b/define.go index f35c7a3..8efb692 100644 --- a/define.go +++ b/define.go @@ -11,7 +11,7 @@ import ( "encoding/json" "time" - "git.zhangdeman.cn/zhangdeman/gopkg/util" + "git.zhangdeman.cn/zhangdeman/util" "git.zhangdeman.cn/zhangdeman/websocket/context" "go.uber.org/zap" ) @@ -45,7 +45,7 @@ func getLoadDataList(wsContext *context.WSContext, fieldList ...zap.Field) []zap zap.String("connection_id", wsContext.ConnectionID), zap.String("trace_id", wsContext.TraceID), zap.String("module_flag", wsContext.Flag), - zap.String("server_ip", util.GetHostIP()), + zap.String("server_ip", util.IP.GetHostIP()), zap.Int64("timestamp", time.Now().UnixNano()), } list = append(list, fieldList...) diff --git a/go.mod b/go.mod index ee415b2..e719e70 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,6 @@ module git.zhangdeman.cn/zhangdeman/websocket go 1.20 require ( - git.zhangdeman.cn/zhangdeman/gopkg v0.0.0-20220404153548-f65ee3641a1e github.com/gin-contrib/pprof v1.4.0 github.com/gin-gonic/gin v1.9.1 github.com/pkg/errors v0.9.1 @@ -50,7 +49,6 @@ require ( golang.org/x/sys v0.8.0 // indirect golang.org/x/text v0.9.0 // indirect google.golang.org/protobuf v1.30.0 // indirect - gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/go.sum b/go.sum index d201b4d..b1fc494 100644 --- a/go.sum +++ b/go.sum @@ -2,8 +2,6 @@ git.zhangdeman.cn/zhangdeman/easylock v0.0.0-20230213084013-900ab57d3fb8 h1:lXzr git.zhangdeman.cn/zhangdeman/easylock v0.0.0-20230213084013-900ab57d3fb8/go.mod h1:gSBMJHL1oR/wr3ziIRicjRAl2wgrkAic/Qx1IA3pnjs= git.zhangdeman.cn/zhangdeman/easymap v0.0.0-20230307094841-e437ba87af10 h1:+Lg4vXFEiWVKjhUJdXuoP0AgjGT49oqJ3301STnZErk= git.zhangdeman.cn/zhangdeman/easymap v0.0.0-20230307094841-e437ba87af10/go.mod h1:+Lc0zYF8sylRi75A7NGmObrLxugwAZa8WVpWh2eh5X0= -git.zhangdeman.cn/zhangdeman/gopkg v0.0.0-20220404153548-f65ee3641a1e h1:sSemK4Q1HmqM9ZM8KXre9polJeXVScNrPsXIDih5Xys= -git.zhangdeman.cn/zhangdeman/gopkg v0.0.0-20220404153548-f65ee3641a1e/go.mod h1:YuvLB+lJbmG1oFRUIMF7JVnrfLqeXUYoZqKt103xsOg= git.zhangdeman.cn/zhangdeman/logger v0.0.0-20230530101401-4326fad68c6f h1:IILGYXUlNGtr61Q6VaHneyjT0IFcHekSeFsQEVjUCdc= git.zhangdeman.cn/zhangdeman/logger v0.0.0-20230530101401-4326fad68c6f/go.mod h1:RYrfkfiMNRR+pApm+xh8B/skCXgEVjJS/1AyXYAaYno= git.zhangdeman.cn/zhangdeman/util v0.0.0-20230505025924-96532aff0019 h1:eJ/9rEj2iI8P9I1DfCmMUvsV+n2EiAWCXnI9yVVDHO0= @@ -173,7 +171,6 @@ gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EV gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/olahol/melody.v1 v1.0.0-20170518105555-d52139073376 h1:sY2a+y0j4iDrajJcorb+a0hJIQ6uakU5gybjfLWHlXo= gopkg.in/olahol/melody.v1 v1.0.0-20170518105555-d52139073376/go.mod h1:BHKOc1m5wm8WwQkMqYBoo4vNxhmF7xg8+xhG8L+Cy3M= -gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=